xfs: namespace the maximum length/refcount symbols

Actually namespace these variables properly, so that readers can tell
that this is an XFS symbol, and that it's for the refcount
functionality.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index f33838df9cfb0002be2defc0bc2fbbf9ec608fde..77d41927fc45379a524f706ca12852d2a1eb4672 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -1778,8 +1778,8 @@ struct xfs_refcount_key {
        __be32          rc_startblock;  /* starting block number */
 };
 
-#define MAXREFCOUNT    ((xfs_nlink_t)~0U)
-#define MAXREFCEXTLEN  ((xfs_extlen_t)~0U)
+#define XFS_REFC_REFCOUNT_MAX  ((xfs_nlink_t)~0U)
+#define XFS_REFC_LEN_MAX       ((xfs_extlen_t)~0U)
 
 /* btree pointer type */
 typedef __be32 xfs_refcount_ptr_t;

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 9db061fc998e2f10feec5eee9278a3bde7f13fdb..4f0281c6baa5c653cd946668d0603618dcb32cdf 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -128,7 +128,7 @@ xfs_refcount_check_irec(
        struct xfs_perag                *pag,
        const struct xfs_refcount_irec  *irec)
 {
-       if (irec->rc_blockcount == 0 || irec->rc_blockcount > MAXREFCEXTLEN)
+       if (irec->rc_blockcount == 0 || irec->rc_blockcount > XFS_REFC_LEN_MAX)
                return __this_address;
 
        if (!xfs_refcount_check_domain(irec))
@@ -138,7 +138,7 @@ xfs_refcount_check_irec(
        if (!xfs_verify_agbext(pag, irec->rc_startblock, irec->rc_blockcount))
                return __this_address;
 
-       if (irec->rc_refcount == 0 || irec->rc_refcount > MAXREFCOUNT)
+       if (irec->rc_refcount == 0 || irec->rc_refcount > XFS_REFC_REFCOUNT_MAX)
                return __this_address;
 
        return NULL;
@@ -853,9 +853,9 @@ xfs_refc_merge_refcount(
        const struct xfs_refcount_irec  *irec,
        enum xfs_refc_adjust_op         adjust)
 {
-       /* Once a record hits MAXREFCOUNT, it is pinned there forever */
-       if (irec->rc_refcount == MAXREFCOUNT)
-               return MAXREFCOUNT;
+       /* Once a record hits XFS_REFC_REFCOUNT_MAX, it is pinned forever */
+       if (irec->rc_refcount == XFS_REFC_REFCOUNT_MAX)
+               return XFS_REFC_REFCOUNT_MAX;
        return irec->rc_refcount + adjust;
 }
 
@@ -898,7 +898,7 @@ xfs_refc_want_merge_center(
         * hence we need to catch u32 addition overflows here.
         */
        ulen += cleft->rc_blockcount + right->rc_blockcount;
-       if (ulen >= MAXREFCEXTLEN)
+       if (ulen >= XFS_REFC_LEN_MAX)
                return false;
 
        *ulenp = ulen;
@@ -933,7 +933,7 @@ xfs_refc_want_merge_left(
         * hence we need to catch u32 addition overflows here.
         */
        ulen += cleft->rc_blockcount;
-       if (ulen >= MAXREFCEXTLEN)
+       if (ulen >= XFS_REFC_LEN_MAX)
                return false;
 
        return true;
@@ -967,7 +967,7 @@ xfs_refc_want_merge_right(
         * hence we need to catch u32 addition overflows here.
         */
        ulen += cright->rc_blockcount;
-       if (ulen >= MAXREFCEXTLEN)
+       if (ulen >= XFS_REFC_LEN_MAX)
                return false;
 
        return true;
@@ -1196,7 +1196,7 @@ xfs_refcount_adjust_extents(
                 * Adjust the reference count and either update the tree
                 * (incr) or free the blocks (decr).
                 */
-               if (ext.rc_refcount == MAXREFCOUNT)
+               if (ext.rc_refcount == XFS_REFC_REFCOUNT_MAX)
                        goto skip;
                ext.rc_refcount += adj;
                trace_xfs_refcount_modify_extent(cur, &ext);

diff --git a/fs/xfs/scrub/refcount.c b/fs/xfs/scrub/refcount.c
index 2b6be75e94241515f573e6caf77e3ef88bebd88a..2c021ed231212ca904f77a39d4cc7547c980c33e 100644 (file)
--- a/fs/xfs/scrub/refcount.c
+++ b/fs/xfs/scrub/refcount.c
@@ -421,7 +421,7 @@ xchk_refcount_mergeable(
        if (r1->rc_refcount != r2->rc_refcount)
                return false;
        if ((unsigned long long)r1->rc_blockcount + r2->rc_blockcount >
-                       MAXREFCEXTLEN)
+                       XFS_REFC_LEN_MAX)
                return false;
 
        return true;

diff --git a/fs/xfs/scrub/refcount_repair.c b/fs/xfs/scrub/refcount_repair.c
index 4240fff459cb1d4f837b5ae5842f8b5b86b3d64e..f160ba98e4df06dd262e83461e118622263278c0 100644 (file)
--- a/fs/xfs/scrub/refcount_repair.c
+++ b/fs/xfs/scrub/refcount_repair.c
@@ -183,7 +183,7 @@ xrep_refc_stash(
        if (xchk_should_terminate(sc, &error))
                return error;
 
-       irec.rc_refcount = min_t(uint64_t, MAXREFCOUNT, refcount);
+       irec.rc_refcount = min_t(uint64_t, XFS_REFC_REFCOUNT_MAX, refcount);
 
        error = xrep_refc_check_ext(rr->sc, &irec);
        if (error)
@@ -422,7 +422,7 @@ xrep_refc_find_refcounts(
        /*
         * Set up a bag to store all the rmap records that we're tracking to
         * generate a reference count record.  If the size of the bag exceeds
-        * MAXREFCOUNT, we clamp rc_refcount.
+        * XFS_REFC_REFCOUNT_MAX, we clamp rc_refcount.
         */
        error = rcbag_init(sc->mp, sc->xmbtp, &rcstack);
        if (error)