xfs: refactor domain and refcount checking

Create a helper function to ensure that CoW staging extent records have
a single refcount and that shared extent records have more than 1
refcount.  We'll put this to more use in the next patch.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 0f920eff34c4a9301324ad0857332feffe8336f6..8eaa11470f469410e25410cb029ec72061b6645d 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -142,10 +142,7 @@ xfs_refcount_get_rec(
        if (irec->rc_blockcount == 0 || irec->rc_blockcount > MAXREFCEXTLEN)
                goto out_bad_rec;
 
-       /* handle special COW-staging domain */
-       if (irec->rc_domain == XFS_REFC_DOMAIN_COW && irec->rc_refcount != 1)
-               goto out_bad_rec;
-       if (irec->rc_domain == XFS_REFC_DOMAIN_SHARED && irec->rc_refcount < 2)
+       if (!xfs_refcount_check_domain(irec))
                goto out_bad_rec;
 
        /* check for valid extent range, including overflow */

diff --git a/fs/xfs/libxfs/xfs_refcount.h b/fs/xfs/libxfs/xfs_refcount.h
index 3beb5a30a9c9e54b2c33db7cce8ede2970078921..ee32e8eb5a993178fabed2b7a280d59047c3b814 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.h
+++ b/fs/xfs/libxfs/xfs_refcount.h
@@ -55,6 +55,18 @@ struct xfs_refcount_intent {
        xfs_fsblock_t                           ri_startblock;
 };
 
+/* Check that the refcount is appropriate for the record domain. */
+static inline bool
+xfs_refcount_check_domain(
+       const struct xfs_refcount_irec  *irec)
+{
+       if (irec->rc_domain == XFS_REFC_DOMAIN_COW && irec->rc_refcount != 1)
+               return false;
+       if (irec->rc_domain == XFS_REFC_DOMAIN_SHARED && irec->rc_refcount < 2)
+               return false;
+       return true;
+}
+
 void xfs_refcount_increase_extent(struct xfs_trans *tp,
                struct xfs_bmbt_irec *irec);
 void xfs_refcount_decrease_extent(struct xfs_trans *tp,

diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
index af5b796ec9ecb1be7d992e96f5198b0c60fdd6d4..fe5ffe4f478d8ab90a0117fca1e73500cef7cec5 100644 (file)
--- a/fs/xfs/scrub/refcount.c
+++ b/fs/xfs/scrub/refcount.c
@@ -337,14 +337,12 @@ xchk_refcountbt_rec(
 
        xfs_refcount_btrec_to_irec(rec, &irec);
 
-       /* Only CoW records can have refcount == 1. */
-       if (irec.rc_domain == XFS_REFC_DOMAIN_SHARED && irec.rc_refcount == 1)
+       /* Check the domain and refcount are not incompatible. */
+       if (!xfs_refcount_check_domain(&irec))
                xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
-       if (irec.rc_domain == XFS_REFC_DOMAIN_COW) {
-               if (irec.rc_refcount != 1)
-                       xchk_btree_set_corrupt(bs->sc, bs->cur, 0);
+
+       if (irec.rc_domain == XFS_REFC_DOMAIN_COW)
                (*cow_blocks) += irec.rc_blockcount;
-       }
 
        /* Check the extent. */
        if (!xfs_verify_agbext(pag, irec.rc_startblock, irec.rc_blockcount))