vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

ino and dev must both match for a file to be identical.

Browse source 
This case is triggered frequently on ZFS.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
This commit is contained in:
Burke Libbey 2015-05-05 11:06:54 -04:00
parent a423e54ba4
commit 5ba8c22385
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
archive/changes_linux.go
View file

@ -100,6 +100,15 @@ func (w *walker) walk(path string, i1, i2 os.FileInfo) (err error) {
is1Dir := i1 != nil && i1.IsDir() is1Dir := i1 != nil && i1.IsDir()
is2Dir := i2 != nil && i2.IsDir() is2Dir := i2 != nil && i2.IsDir()
sameDevice := false
if i1 != nil && i2 != nil {
si1 := i1.Sys().(*syscall.Stat_t)
si2 := i2.Sys().(*syscall.Stat_t)
if si1.Dev == si2.Dev {
sameDevice = true
}
}
// If these files are both non-existent, or leaves (non-dirs), we are done. // If these files are both non-existent, or leaves (non-dirs), we are done.
if !is1Dir && !is2Dir { if !is1Dir && !is2Dir {
return nil return nil
@ -144,7 +153,7 @@ func (w *walker) walk(path string, i1, i2 os.FileInfo) (err error) {
names = append(names, ni1.name) names = append(names, ni1.name)
ix1++ ix1++
case 0: // ni1 == ni2 case 0: // ni1 == ni2
if ni1.ino != ni2.ino { if ni1.ino != ni2.ino || !sameDevice {
names = append(names, ni1.name) names = append(names, ni1.name)
} }
ix1++ ix1++