xfs: namespace the maximum length/refcount symbols

Source kernel commit: 70fcf6866578e69635399e806273376f5e0b8e2b

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>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/libxfs/xfs_format.h b/libxfs/xfs_format.h
index fba4e59aded4a02ac340583a6b61eb2d920d9107..16696bc3ff94454c49fcdeb0f94d9c82f5daee80 100644 (file)
--- a/libxfs/xfs_format.h
+++ b/libxfs/xfs_format.h
@@ -1790,8 +1790,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/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index fb7c56a5a32921f501f95fa447fd62840bad32e0..1aeea0b161849d4abc41e24c700978cdec25ddc5 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -127,7 +127,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))
@@ -137,7 +137,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;
@@ -852,9 +852,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;
 }
 
@@ -897,7 +897,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;
@@ -932,7 +932,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;
@@ -966,7 +966,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;
@@ -1195,7 +1195,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/repair/rmap.c b/repair/rmap.c
index 1c6a8691b8cb2cddf0c74b4cbe458cc5ea56f042..bd91c721e20e4e4a979f0eb7f1041d0df2025e71 100644 (file)
--- a/repair/rmap.c
+++ b/repair/rmap.c
@@ -793,7 +793,7 @@ refcount_emit(
                agno, agbno, len, nr_rmaps);
        rlrec.rc_startblock = agbno;
        rlrec.rc_blockcount = len;
-       nr_rmaps = min(nr_rmaps, MAXREFCOUNT);
+       nr_rmaps = min(nr_rmaps, XFS_REFC_REFCOUNT_MAX);
        rlrec.rc_refcount = nr_rmaps;
        rlrec.rc_domain = XFS_REFC_DOMAIN_SHARED;
 

diff --git a/repair/scan.c b/repair/scan.c
index 221d660e81fdb47c17a57ac17d73711058cfde75..88fbda6b83f61a449f757c5387b32a0b01750283 100644 (file)
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -1503,7 +1503,7 @@ _("extent (%u/%u) len %u claimed, state is %d\n"),
                                                break;
                                        }
                                }
-                       } else if (nr < 2 || nr > MAXREFCOUNT) {
+                       } else if (nr < 2 || nr > XFS_REFC_REFCOUNT_MAX) {
                                do_warn(
        _("invalid reference count %u in record %u of %s btree block %u/%u\n"),
                                        nr, i, name, agno, bno);