libxfs: replace XFS_BUF_SET_ADDR with a function

Replace XFS_BUF_SET_ADDR with a new function that will set the buffer
block number correctly, then port the two users to it.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
[sandeen: leave b_maps[0].bm_bn until next patch]
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h
index 3cc4f4ee87eeda816278a18465924006afa53481..bf489259dedb48af4e85be447cd465a1a1601456 100644 (file)
--- a/libxfs/libxfs_io.h
+++ b/libxfs/libxfs_io.h
@@ -116,7 +116,10 @@ typedef unsigned int xfs_buf_flags_t;
 #define xfs_buf_offset(bp, offset)     ((bp)->b_addr + (offset))
 #define XFS_BUF_ADDR(bp)               ((bp)->b_bn)
 
-#define XFS_BUF_SET_ADDR(bp,blk)       ((bp)->b_bn = (blk))
+static inline void xfs_buf_set_daddr(struct xfs_buf *bp, xfs_daddr_t blkno)
+{
+       bp->b_bn = blkno;
+}
 
 void libxfs_buf_set_priority(struct xfs_buf *bp, int priority);
 int libxfs_buf_priority(struct xfs_buf *bp);

diff --git a/libxlog/xfs_log_recover.c b/libxlog/xfs_log_recover.c
index bb52af555166d4e8cc5f75aa79aaee10f0282e8b..f48700e57a9494d40ebcaf81ed51de54847e56a5 100644 (file)
--- a/libxlog/xfs_log_recover.c
+++ b/libxlog/xfs_log_recover.c
@@ -114,7 +114,7 @@ xlog_bread_noalign(
        ASSERT(nbblks > 0);
        ASSERT(nbblks <= bp->b_length);
 
-       XFS_BUF_SET_ADDR(bp, log->l_logBBstart + blk_no);
+       xfs_buf_set_daddr(bp, log->l_logBBstart + blk_no);
        bp->b_length = nbblks;
        bp->b_error = 0;
 

diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
index 63895f28d6be5dd96eda6b46d99392b6f6c12995..50abe050b9e297dadfc41dc2bea95238e9944f3a 100644 (file)
--- a/mkfs/xfs_mkfs.c
+++ b/mkfs/xfs_mkfs.c
@@ -3505,7 +3505,8 @@ alloc_write_buf(
                                error);
                exit(1);
        }
-       bp->b_bn = daddr;
+
+       xfs_buf_set_daddr(bp, daddr);
        bp->b_maps[0].bm_bn = daddr;
        return bp;
 }