xfs: remove rt-wrappers from xfs_format.h

xfs_format.h has a bunch odd wrappers for helper functions and mount
structure access using RT* prefixes.  Replace them with their open coded
versions (for those that weren't entirely unused) and remove the wrappers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>

diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index e6ca188e2271256c22254c64d5d99a436d62ffc7..7d2873a79a48a5cc538dad1499637c76547f4fd7 100644 (file)
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -1156,20 +1156,12 @@ static inline bool xfs_dinode_has_large_extent_counts(
 #define        XFS_DFL_RTEXTSIZE       (64 * 1024)             /* 64kB */
 #define        XFS_MIN_RTEXTSIZE       (4 * 1024)              /* 4kB */
 
-#define        XFS_BLOCKSIZE(mp)       ((mp)->m_sb.sb_blocksize)
-#define        XFS_BLOCKMASK(mp)       ((mp)->m_blockmask)
-
 /*
  * RT bit manipulation macros.
  */
 #define        XFS_RTMIN(a,b)  ((a) < (b) ? (a) : (b))
 #define        XFS_RTMAX(a,b)  ((a) > (b) ? (a) : (b))
 
-#define        XFS_RTLOBIT(w)  xfs_lowbit32(w)
-#define        XFS_RTHIBIT(w)  xfs_highbit32(w)
-
-#define        XFS_RTBLOCKLOG(b)       xfs_highbit64(b)
-
 /*
  * Dquot and dquot block format definitions
  */

diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c
index 5773e4ea36c624e82cc5e2bf87257caffb128dd8..4185ccf83bab689d88e1d33680c2a89472cd6966 100644 (file)
--- a/fs/xfs/libxfs/xfs_rtbitmap.c
+++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -195,7 +195,7 @@ xfs_rtfind_back(
                        /*
                         * Different.  Mark where we are and return.
                         */
-                       i = bit - XFS_RTHIBIT(wdiff);
+                       i = bit - xfs_highbit32(wdiff);
                        *rtx = start - i + 1;
                        return 0;
                }
@@ -233,7 +233,7 @@ xfs_rtfind_back(
                        /*
                         * Different, mark where we are and return.
                         */
-                       i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
+                       i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);
                        *rtx = start - i + 1;
                        return 0;
                }
@@ -272,7 +272,7 @@ xfs_rtfind_back(
                        /*
                         * Different, mark where we are and return.
                         */
-                       i += XFS_NBWORD - 1 - XFS_RTHIBIT(wdiff);
+                       i += XFS_NBWORD - 1 - xfs_highbit32(wdiff);
                        *rtx = start - i + 1;
                        return 0;
                } else
@@ -348,7 +348,7 @@ xfs_rtfind_forw(
                        /*
                         * Different.  Mark where we are and return.
                         */
-                       i = XFS_RTLOBIT(wdiff) - bit;
+                       i = xfs_lowbit32(wdiff) - bit;
                        *rtx = start + i - 1;
                        return 0;
                }
@@ -386,7 +386,7 @@ xfs_rtfind_forw(
                        /*
                         * Different, mark where we are and return.
                         */
-                       i += XFS_RTLOBIT(wdiff);
+                       i += xfs_lowbit32(wdiff);
                        *rtx = start + i - 1;
                        return 0;
                }
@@ -423,7 +423,7 @@ xfs_rtfind_forw(
                        /*
                         * Different, mark where we are and return.
                         */
-                       i += XFS_RTLOBIT(wdiff);
+                       i += xfs_lowbit32(wdiff);
                        *rtx = start + i - 1;
                        return 0;
                } else
@@ -708,7 +708,7 @@ xfs_rtfree_range(
         */
        if (preblock < start) {
                error = xfs_rtmodify_summary(args,
-                               XFS_RTBLOCKLOG(start - preblock),
+                               xfs_highbit64(start - preblock),
                                xfs_rtx_to_rbmblock(mp, preblock), -1);
                if (error) {
                        return error;
@@ -720,7 +720,7 @@ xfs_rtfree_range(
         */
        if (postblock > end) {
                error = xfs_rtmodify_summary(args,
-                               XFS_RTBLOCKLOG(postblock - end),
+                               xfs_highbit64(postblock - end),
                                xfs_rtx_to_rbmblock(mp, end + 1), -1);
                if (error) {
                        return error;
@@ -731,7 +731,7 @@ xfs_rtfree_range(
         * (new) free extent.
         */
        return xfs_rtmodify_summary(args,
-                       XFS_RTBLOCKLOG(postblock + 1 - preblock),
+                       xfs_highbit64(postblock + 1 - preblock),
                        xfs_rtx_to_rbmblock(mp, preblock), 1);
 }
 
@@ -800,7 +800,7 @@ xfs_rtcheck_range(
                        /*
                         * Different, compute first wrong bit and return.
                         */
-                       i = XFS_RTLOBIT(wdiff) - bit;
+                       i = xfs_lowbit32(wdiff) - bit;
                        *new = start + i;
                        *stat = 0;
                        return 0;
@@ -839,7 +839,7 @@ xfs_rtcheck_range(
                        /*
                         * Different, compute first wrong bit and return.
                         */
-                       i += XFS_RTLOBIT(wdiff);
+                       i += xfs_lowbit32(wdiff);
                        *new = start + i;
                        *stat = 0;
                        return 0;
@@ -877,7 +877,7 @@ xfs_rtcheck_range(
                        /*
                         * Different, compute first wrong bit and return.
                         */
-                       i += XFS_RTLOBIT(wdiff);
+                       i += xfs_lowbit32(wdiff);
                        *new = start + i;
                        *stat = 0;
                        return 0;

diff --git a/fs/xfs/scrub/rtsummary.c b/fs/xfs/scrub/rtsummary.c
index b0d90426a5cb8d214c8cdf38a6f1da92fc926eb7..fabd0ed9dfa67637686768dff5d27ef0ee78674d 100644 (file)
--- a/fs/xfs/scrub/rtsummary.c
+++ b/fs/xfs/scrub/rtsummary.c
@@ -177,7 +177,7 @@ xchk_rtsum_record_free(
 
        /* Compute the relevant location in the rtsum file. */
        rbmoff = xfs_rtx_to_rbmblock(mp, rec->ar_startext);
-       lenlog = XFS_RTBLOCKLOG(rec->ar_extcount);
+       lenlog = xfs_highbit64(rec->ar_extcount);
        offs = xfs_rtsumoffs(mp, lenlog, rbmoff);
 
        rtbno = xfs_rtx_to_rtb(mp, rec->ar_startext);

diff --git a/fs/xfs/xfs_rtalloc.c b/fs/xfs/xfs_rtalloc.c
index cd183d050fd2ee5af761d4560ac1616f767d5cb0..be93542827cfd8abedee621fcf6de1c1be3d51c7 100644 (file)
--- a/fs/xfs/xfs_rtalloc.c
+++ b/fs/xfs/xfs_rtalloc.c
@@ -156,7 +156,7 @@ xfs_rtallocate_range(
         * (old) free extent.
         */
        error = xfs_rtmodify_summary(args,
-                       XFS_RTBLOCKLOG(postblock + 1 - preblock),
+                       xfs_highbit64(postblock + 1 - preblock),
                        xfs_rtx_to_rbmblock(mp, preblock), -1);
        if (error)
                return error;
@@ -167,7 +167,7 @@ xfs_rtallocate_range(
         */
        if (preblock < start) {
                error = xfs_rtmodify_summary(args,
-                               XFS_RTBLOCKLOG(start - preblock),
+                               xfs_highbit64(start - preblock),
                                xfs_rtx_to_rbmblock(mp, preblock), 1);
                if (error)
                        return error;
@@ -179,7 +179,7 @@ xfs_rtallocate_range(
         */
        if (postblock > end) {
                error = xfs_rtmodify_summary(args,
-                               XFS_RTBLOCKLOG(postblock - end),
+                               xfs_highbit64(postblock - end),
                                xfs_rtx_to_rbmblock(mp, end + 1), 1);
                if (error)
                        return error;