xfs: count inode blocks correctly in inobt scrub

A big block filesystem might require more than one inobt record to cover
all the inodes in the block.  In these cases it is not correct to round
the irec count up to the nearest block because this causes us to
overestimate the number of inode blocks we expect to find.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index 9b5287a..882dc56 100644 (file)
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -44,6 +44,11 @@ xchk_setup_ag_iallocbt(
 
 /* Inode btree scrubber. */
 
+struct xchk_iallocbt {
+       /* Number of inodes we see while scanning inobt. */
+       unsigned long long      inodes;
+};
+
 /*
  * If we're checking the finobt, cross-reference with the inobt.
  * Otherwise we're checking the inobt; if there is an finobt, make sure
@@ -266,7 +271,7 @@ xchk_iallocbt_rec(
        union xfs_btree_rec             *rec)
 {
        struct xfs_mount                *mp = bs->cur->bc_mp;
-       xfs_filblks_t                   *inode_blocks = bs->private;
+       struct xchk_iallocbt            *iabt = bs->private;
        struct xfs_inobt_rec_incore     irec;
        uint64_t                        holes;
        xfs_agnumber_t                  agno = bs->cur->bc_private.a.agno;
@@ -304,8 +309,7 @@ xchk_iallocbt_rec(
            (agbno & (mp->m_blocks_per_cluster - 1)))
                xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
 
-       *inode_blocks += XFS_B_TO_FSB(mp,
-                       irec.ir_count * mp->m_sb.sb_inodesize);
+       iabt->inodes += irec.ir_count;
 
        /* Handle non-sparse inodes */
        if (!xfs_inobt_issparse(irec.ir_holemask)) {
@@ -397,9 +401,10 @@ STATIC void
 xchk_iallocbt_xref_rmap_inodes(
        struct xfs_scrub        *sc,
        int                     which,
-       xfs_filblks_t           inode_blocks)
+       unsigned long long      inodes)
 {
        xfs_filblks_t           blocks;
+       xfs_filblks_t           inode_blocks;
        int                     error;
 
        if (!sc->sa.rmap_cur || xchk_skip_xref(sc->sm))
@@ -410,6 +415,7 @@ xchk_iallocbt_xref_rmap_inodes(
                        &XFS_RMAP_OINFO_INODES, &blocks);
        if (!xchk_should_check_xref(sc, &error, &sc->sa.rmap_cur))
                return;
+       inode_blocks = XFS_B_TO_FSB(sc->mp, inodes * sc->mp->m_sb.sb_inodesize);
        if (blocks != inode_blocks)
                xchk_btree_xref_set_corrupt(sc, sc->sa.rmap_cur, 0);
 }
@@ -421,12 +427,14 @@ xchk_iallocbt(
        xfs_btnum_t             which)
 {
        struct xfs_btree_cur    *cur;
-       xfs_filblks_t           inode_blocks = 0;
+       struct xchk_iallocbt    iabt = {
+               .inodes         = 0,
+       };
        int                     error;
 
        cur = which == XFS_BTNUM_INO ? sc->sa.ino_cur : sc->sa.fino_cur;
        error = xchk_btree(sc, cur, xchk_iallocbt_rec, &XFS_RMAP_OINFO_INOBT,
-                       &inode_blocks);
+                       &iabt);
        if (error)
                return error;
 
@@ -440,7 +448,7 @@ xchk_iallocbt(
         * to inode chunks with free inodes.
         */
        if (which == XFS_BTNUM_INO)
-               xchk_iallocbt_xref_rmap_inodes(sc, which, inode_blocks);
+               xchk_iallocbt_xref_rmap_inodes(sc, which, iabt.inodes);
 
        return error;
 }