xfs_db: scan entire file system when using 'frag'

While running the 'frag' command of 'xfs_db' we noticed that the
tool is not scanning all the files in the file system.  We noticed
this when we modified the tool to print the inodes of all the files
scanned.  For example:

 $ find /mnt/xfsdisk -type f | wc -l
 1782674
 $ xfs_db -r -c frag /dev/sdXX  | grep MB | awk '{print $5}' | paste -s -d+ | bc
 656818

Upon inspecting the code we noticed that the scanfunc_ino function
stops processing a given inode block once it encounters a free leaf.
However, in practice we see that inodes are necessarily always layed
out contiguously on the leaf node.  This resulted in the 'frag'
command skipping some valid inodes.

In this change we modify the scanfunc_ino function to skip freed
inodes.  With the change in place we ran the same experiment again
and noticed a more accurate file count:

 $ find /mnt/d0 -type f | wc -l
 1810442
 $ xfs_db -r -c frag /dev/sdXX  | grep MB | awk '{print $5}' | paste -s -d+ | bc
 1810442

Fixes: 2a5eb70c ("xfs_db: teach the frag command about sparse inode chunks")
Signed-off-by: Jorge Guerra <jorgeguerra@fb.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/db/frag.c b/db/frag.c
index 51000d83ab63b033b9445bbf3fc3092e013a1a6f..af7ae9982b5bbbb596e52bd9aa60b8e5f801f318 100644 (file)
--- a/db/frag.c
+++ b/db/frag.c
@@ -507,7 +507,7 @@ scanfunc_ino(
 
                                for (j = 0; j < inodes_per_buf; j++) {
                                        if (XFS_INOBT_IS_FREE_DISK(&rp[i], ioff + j))
-                                               goto next_buf;
+                                               continue;
                                        dip = (xfs_dinode_t *)((char *)iocur_top->data +
                                                ((off + j) << mp->m_sb.sb_inodelog));
                                        process_inode(agf, agino + ioff + j, dip);