Skip to content

Remove non-determinism in hard link handling #945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dcantah merged 1 commit into from
Feb 11, 2021
Merged

Remove non-determinism in hard link handling #945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ext4/internal/compactext4/compact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,13 @@ func (w *Writer) writeDirectory(dir, parent *inode) error {
children = append(children, name)
}
sort.Slice(children, func(i, j int) bool {
return dir.Children[children[i]].Number < dir.Children[children[j]].Number
left_num := dir.Children[children[i]].Number
right_num := dir.Children[children[j]].Number

if left_num == right_num {
return children[i] < children[j]
}
return left_num < right_num
})

for _, name := range children {
Expand Down Expand Up @@ -952,7 +958,13 @@ func (w *Writer) writeDirectoryRecursive(dir, parent *inode) error {
children = append(children, name)
}
sort.Slice(children, func(i, j int) bool {
return dir.Children[children[i]].Number < dir.Children[children[j]].Number
left_num := dir.Children[children[i]].Number
right_num := dir.Children[children[j]].Number

if left_num == right_num {
return children[i] < children[j]
}
return left_num < right_num
})

for _, name := range children {
Expand Down