Fix usage calculation to account for sparse files

dmcgowan · dmcgowan · commit bc5e3edd2b74 · 2020-11-18T23:37:56.000-08:00
The current usage calculation does not account for usage within
spares files. To correctly account for the usage, the number of
blocks must be used rather than the reported file size.

Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/fs/du_unix.go b/fs/du_unix.go
@@ -59,10 +59,11 @@ func diskUsage(ctx context.Context, roots ...string) (Usage, error) {
 			default:
 			}
 
-			inoKey := newInode(fi.Sys().(*syscall.Stat_t))
+			stat := fi.Sys().(*syscall.Stat_t)
+			inoKey := newInode(stat)
 			if _, ok := inodes[inoKey]; !ok {
 				inodes[inoKey] = struct{}{}
-				size += fi.Size()
+				size += stat.Blocks * stat.Blksize
 			}
 
 			return nil
@@ -89,10 +90,11 @@ func diffUsage(ctx context.Context, a, b string) (Usage, error) {
 		}
 
 		if kind == ChangeKindAdd || kind == ChangeKindModify {
-			inoKey := newInode(fi.Sys().(*syscall.Stat_t))
+			stat := fi.Sys().(*syscall.Stat_t)
+			inoKey := newInode(stat)
 			if _, ok := inodes[inoKey]; !ok {
 				inodes[inoKey] = struct{}{}
-				size += fi.Size()
+				size += stat.Blocks * stat.Blksize
 			}
 
 			return nil

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,11 @@ func diskUsage(ctx context.Context, roots ...string) (Usage, error) {`
`59`	`59`	`default:`
`60`	`60`	`}`
`61`	`61`
`62`		`- inoKey := newInode(fi.Sys().(*syscall.Stat_t))`
	`62`	`+ stat := fi.Sys().(*syscall.Stat_t)`
	`63`	`+ inoKey := newInode(stat)`
`63`	`64`	`if _, ok := inodes[inoKey]; !ok {`
`64`	`65`	`inodes[inoKey] = struct{}{}`
`65`		`- size += fi.Size()`
	`66`	`+ size += stat.Blocks * stat.Blksize`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`return nil`
`@@ -89,10 +90,11 @@ func diffUsage(ctx context.Context, a, b string) (Usage, error) {`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`if kind == ChangeKindAdd \|\| kind == ChangeKindModify {`
`92`		`- inoKey := newInode(fi.Sys().(*syscall.Stat_t))`
	`93`	`+ stat := fi.Sys().(*syscall.Stat_t)`
	`94`	`+ inoKey := newInode(stat)`
`93`	`95`	`if _, ok := inodes[inoKey]; !ok {`
`94`	`96`	`inodes[inoKey] = struct{}{}`
`95`		`- size += fi.Size()`
	`97`	`+ size += stat.Blocks * stat.Blksize`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`return nil`