Merge tag 'xfs-6.9-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-block.git] / fs / xfs / scrub / ialloc.c

diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c
index a720fc62262a61d6f825fc2730b5536b1a99b0b9..750d7b0cd25a78c3d6ac0f8630c56cc4e6012a8b 100644 (file)
--- a/fs/xfs/scrub/ialloc.c
+++ b/fs/xfs/scrub/ialloc.c
@@ -76,7 +76,7 @@ xchk_inobt_xref_finobt(
        int                     has_record;
        int                     error;
 
-       ASSERT(cur->bc_btnum == XFS_BTNUM_FINO);
+       ASSERT(xfs_btree_is_fino(cur->bc_ops));
 
        error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_LE, &has_record);
        if (error)
@@ -179,7 +179,7 @@ xchk_finobt_xref_inobt(
        int                     has_record;
        int                     error;
 
-       ASSERT(cur->bc_btnum == XFS_BTNUM_INO);
+       ASSERT(xfs_btree_is_ino(cur->bc_ops));
 
        error = xfs_inobt_lookup(cur, agino, XFS_LOOKUP_LE, &has_record);
        if (error)
@@ -514,7 +514,7 @@ xchk_iallocbt_rec_alignment(
         * Otherwise, we expect that the finobt record is aligned to the
         * cluster alignment as told by the superblock.
         */
-       if (bs->cur->bc_btnum == XFS_BTNUM_FINO) {
+       if (xfs_btree_is_fino(bs->cur->bc_ops)) {
                unsigned int    imask;
 
                imask = min_t(unsigned int, XFS_INODES_PER_CHUNK,
@@ -649,8 +649,7 @@ out:
  */
 STATIC void
 xchk_iallocbt_xref_rmap_btreeblks(
-       struct xfs_scrub        *sc,
-       int                     which)
+       struct xfs_scrub        *sc)
 {
        xfs_filblks_t           blocks;
        xfs_extlen_t            inobt_blocks = 0;
@@ -688,7 +687,6 @@ xchk_iallocbt_xref_rmap_btreeblks(
 STATIC void
 xchk_iallocbt_xref_rmap_inodes(
        struct xfs_scrub        *sc,
-       int                     which,
        unsigned long long      inodes)
 {
        xfs_filblks_t           blocks;
@@ -719,17 +717,14 @@ xchk_iallocbt(
                .next_startino  = NULLAGINO,
                .next_cluster_ino = NULLAGINO,
        };
-       xfs_btnum_t             which;
        int                     error;
 
        switch (sc->sm->sm_type) {
        case XFS_SCRUB_TYPE_INOBT:
                cur = sc->sa.ino_cur;
-               which = XFS_BTNUM_INO;
                break;
        case XFS_SCRUB_TYPE_FINOBT:
                cur = sc->sa.fino_cur;
-               which = XFS_BTNUM_FINO;
                break;
        default:
                ASSERT(0);
@@ -741,7 +736,7 @@ xchk_iallocbt(
        if (error)
                return error;
 
-       xchk_iallocbt_xref_rmap_btreeblks(sc, which);
+       xchk_iallocbt_xref_rmap_btreeblks(sc);
 
        /*
         * If we're scrubbing the inode btree, inode_blocks is the number of
@@ -750,9 +745,8 @@ xchk_iallocbt(
         * knows about.  We can't do this for the finobt since it only points
         * to inode chunks with free inodes.
         */
-       if (which == XFS_BTNUM_INO)
-               xchk_iallocbt_xref_rmap_inodes(sc, which, iabt.inodes);
-
+       if (sc->sm->sm_type == XFS_SCRUB_TYPE_INOBT)
+               xchk_iallocbt_xref_rmap_inodes(sc, iabt.inodes);
        return error;
 }