xfs: convert the rtbitmap block and bit macros to static inline functions

[thirdparty/xfsprogs-dev.git] / libxfs / xfs_rtbitmap.c

diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
index 48e709a28e76aa4d2ffed8df66cccd9ad7f14166..540cb1481813096a7113e8a6dae3492b92df9f17 100644 (file)
--- a/libxfs/xfs_rtbitmap.c
+++ b/libxfs/xfs_rtbitmap.c
@@ -109,12 +109,12 @@ xfs_rtfind_back(
        xfs_rtword_t    mask;           /* mask of relevant bits for value */
        xfs_rtword_t    want;           /* mask for "good" values */
        xfs_rtword_t    wdiff;          /* difference from wanted value */
-       int             word;           /* word number in the buffer */
+       unsigned int    word;           /* word number in the buffer */
 
        /*
         * Compute and read in starting bitmap block for starting block.
         */
-       block = XFS_BITTOBLOCK(mp, start);
+       block = xfs_rtx_to_rbmblock(mp, start);
        error = xfs_rtbuf_get(mp, tp, block, 0, &bp);
        if (error) {
                return error;
@@ -123,7 +123,7 @@ xfs_rtfind_back(
        /*
         * Get the first word's index & point to it.
         */
-       word = XFS_BITTOWORD(mp, start);
+       word = xfs_rtx_to_rbmword(mp, start);
        b = &bufp[word];
        bit = (int)(start & (XFS_NBWORD - 1));
        len = start - limit + 1;
@@ -284,12 +284,12 @@ xfs_rtfind_forw(
        xfs_rtword_t    mask;           /* mask of relevant bits for value */
        xfs_rtword_t    want;           /* mask for "good" values */
        xfs_rtword_t    wdiff;          /* difference from wanted value */
-       int             word;           /* word number in the buffer */
+       unsigned int    word;           /* word number in the buffer */
 
        /*
         * Compute and read in starting bitmap block for starting block.
         */
-       block = XFS_BITTOBLOCK(mp, start);
+       block = xfs_rtx_to_rbmblock(mp, start);
        error = xfs_rtbuf_get(mp, tp, block, 0, &bp);
        if (error) {
                return error;
@@ -298,7 +298,7 @@ xfs_rtfind_forw(
        /*
         * Get the first word's index & point to it.
         */
-       word = XFS_BITTOWORD(mp, start);
+       word = xfs_rtx_to_rbmword(mp, start);
        b = &bufp[word];
        bit = (int)(start & (XFS_NBWORD - 1));
        len = limit - start + 1;
@@ -545,12 +545,12 @@ xfs_rtmodify_range(
        int             i;              /* current bit number rel. to start */
        int             lastbit;        /* last useful bit in word */
        xfs_rtword_t    mask;           /* mask o frelevant bits for value */
-       int             word;           /* word number in the buffer */
+       unsigned int    word;           /* word number in the buffer */
 
        /*
         * Compute starting bitmap block number.
         */
-       block = XFS_BITTOBLOCK(mp, start);
+       block = xfs_rtx_to_rbmblock(mp, start);
        /*
         * Read the bitmap block, and point to its data.
         */
@@ -562,7 +562,7 @@ xfs_rtmodify_range(
        /*
         * Compute the starting word's address, and starting bit.
         */
-       word = XFS_BITTOWORD(mp, start);
+       word = xfs_rtx_to_rbmword(mp, start);
        first = b = &bufp[word];
        bit = (int)(start & (XFS_NBWORD - 1));
        /*
@@ -728,7 +728,7 @@ xfs_rtfree_range(
        if (preblock < start) {
                error = xfs_rtmodify_summary(mp, tp,
                        XFS_RTBLOCKLOG(start - preblock),
-                       XFS_BITTOBLOCK(mp, preblock), -1, rbpp, rsb);
+                       xfs_rtx_to_rbmblock(mp, preblock), -1, rbpp, rsb);
                if (error) {
                        return error;
                }
@@ -740,7 +740,7 @@ xfs_rtfree_range(
        if (postblock > end) {
                error = xfs_rtmodify_summary(mp, tp,
                        XFS_RTBLOCKLOG(postblock - end),
-                       XFS_BITTOBLOCK(mp, end + 1), -1, rbpp, rsb);
+                       xfs_rtx_to_rbmblock(mp, end + 1), -1, rbpp, rsb);
                if (error) {
                        return error;
                }
@@ -751,7 +751,7 @@ xfs_rtfree_range(
         */
        error = xfs_rtmodify_summary(mp, tp,
                XFS_RTBLOCKLOG(postblock + 1 - preblock),
-               XFS_BITTOBLOCK(mp, preblock), 1, rbpp, rsb);
+               xfs_rtx_to_rbmblock(mp, preblock), 1, rbpp, rsb);
        return error;
 }
 
@@ -779,12 +779,12 @@ xfs_rtcheck_range(
        xfs_rtxnum_t    lastbit;        /* last useful bit in word */
        xfs_rtword_t    mask;           /* mask of relevant bits for value */
        xfs_rtword_t    wdiff;          /* difference from wanted value */
-       int             word;           /* word number in the buffer */
+       unsigned int    word;           /* word number in the buffer */
 
        /*
         * Compute starting bitmap block number
         */
-       block = XFS_BITTOBLOCK(mp, start);
+       block = xfs_rtx_to_rbmblock(mp, start);
        /*
         * Read the bitmap block.
         */
@@ -796,7 +796,7 @@ xfs_rtcheck_range(
        /*
         * Compute the starting word's address, and starting bit.
         */
-       word = XFS_BITTOWORD(mp, start);
+       word = xfs_rtx_to_rbmword(mp, start);
        b = &bufp[word];
        bit = (int)(start & (XFS_NBWORD - 1));
        /*