1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #44250 from thaJeztah/fix_pkg_dir

pkg/directory: Size(): add back type-casts to account for platform differences
This commit is contained in:
Sebastiaan van Stijn 2022-10-06 21:44:46 +02:00 committed by GitHub
commit 59c77c8f5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -40,12 +40,12 @@ func Size(ctx context.Context, dir string) (size int64, err error) {
// Check inode to handle hard links correctly // Check inode to handle hard links correctly
inode := fileInfo.Sys().(*syscall.Stat_t).Ino inode := fileInfo.Sys().(*syscall.Stat_t).Ino
// inode is not a uint64 on all platforms. Cast it to avoid issues. //nolint:unconvert // inode is not an uint64 on all platforms.
if _, exists := data[inode]; exists { if _, exists := data[uint64(inode)]; exists {
return nil return nil
} }
// inode is not a uint64 on all platforms. Cast it to avoid issues.
data[inode] = struct{}{} data[uint64(inode)] = struct{}{} //nolint:unconvert // inode is not an uint64 on all platforms.
size += s size += s