From 135e4bfe506193adb96624d3528fe303608a2892 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino Date: Mon, 23 Jul 2018 23:16:36 -0500 Subject: [PATCH] Get rid of XFS_BUF_COUNT() macro Signed-off-by: Carlos Maiolino Reviewed-by: Christoph Hellwig Reviewed-by: Eric Sandeen Signed-off-by: Eric Sandeen --- libxfs/libxfs_io.h | 1 - libxfs/logitem.c | 2 +- libxfs/rdwr.c | 2 +- libxfs/trans.c | 2 +- mkfs/proto.c | 7 +++---- repair/attr_repair.c | 4 ++-- repair/dino_chunks.c | 2 +- repair/prefetch.c | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libxfs/libxfs_io.h b/libxfs/libxfs_io.h index 8d69a1eda..85725c251 100644 --- a/libxfs/libxfs_io.h +++ b/libxfs/libxfs_io.h @@ -88,7 +88,6 @@ enum xfs_buf_flags_t { /* b_flags bits */ #define xfs_buf_offset(bp, offset) ((bp)->b_addr + (offset)) #define XFS_BUF_ADDR(bp) ((bp)->b_bn) #define XFS_BUF_SIZE(bp) ((bp)->b_bcount) -#define XFS_BUF_COUNT(bp) ((bp)->b_bcount) #define XFS_BUF_SET_ADDR(bp,blk) ((bp)->b_bn = (blk)) #define XFS_BUF_SET_COUNT(bp,cnt) ((bp)->b_bcount = (cnt)) diff --git a/libxfs/logitem.c b/libxfs/logitem.c index df1c897be..4da9bc1ba 100644 --- a/libxfs/logitem.c +++ b/libxfs/logitem.c @@ -109,7 +109,7 @@ xfs_buf_item_init( bip->bli_buf = bp; bip->bli_format.blf_type = XFS_LI_BUF; bip->bli_format.blf_blkno = (int64_t)XFS_BUF_ADDR(bp); - bip->bli_format.blf_len = (unsigned short)BTOBB(XFS_BUF_COUNT(bp)); + bip->bli_format.blf_len = (unsigned short)BTOBB(bp->b_bcount); bp->b_log_item = bip; } diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index ba4fe693b..f50876b05 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -131,7 +131,7 @@ static char *next( struct xfs_buf *buf = (struct xfs_buf *)private; if (buf && - (XFS_BUF_COUNT(buf) < (int)(ptr - (char *)buf->b_addr) + offset)) + (buf->b_bcount < (int)(ptr - (char *)buf->b_addr) + offset)) abort(); return ptr + offset; diff --git a/libxfs/trans.c b/libxfs/trans.c index a000f0298..2bb0d3b8e 100644 --- a/libxfs/trans.c +++ b/libxfs/trans.c @@ -375,7 +375,7 @@ libxfs_trans_log_buf( { struct xfs_buf_log_item *bip = bp->b_log_item; - ASSERT((first <= last) && (last < XFS_BUF_COUNT(bp))); + ASSERT((first <= last) && (last < bp->b_bcount)); xfs_trans_dirty_buf(tp, bp); xfs_buf_item_log(bip, first, last); diff --git a/mkfs/proto.c b/mkfs/proto.c index b59ac4cf4..7186036e5 100644 --- a/mkfs/proto.c +++ b/mkfs/proto.c @@ -264,11 +264,10 @@ newfile( bp = libxfs_trans_get_buf(logit ? tp : 0, mp->m_dev, d, nb << mp->m_blkbb_log, 0); memmove(bp->b_addr, buf, len); - if (len < XFS_BUF_COUNT(bp)) - memset((char *)bp->b_addr + len, 0, - XFS_BUF_COUNT(bp) - len); + if (len < bp->b_bcount) + memset((char *)bp->b_addr + len, 0, bp->b_bcount - len); if (logit) - libxfs_trans_log_buf(tp, bp, 0, XFS_BUF_COUNT(bp) - 1); + libxfs_trans_log_buf(tp, bp, 0, bp->b_bcount - 1); else libxfs_writebuf(bp, LIBXFS_EXIT_ON_FAILURE); } diff --git a/repair/attr_repair.c b/repair/attr_repair.c index 5f3824e41..d078522bd 100644 --- a/repair/attr_repair.c +++ b/repair/attr_repair.c @@ -426,9 +426,9 @@ rmtval_get(xfs_mount_t *mp, xfs_ino_t ino, blkmap_t *blkmap, break; } - ASSERT(mp->m_sb.sb_blocksize == XFS_BUF_COUNT(bp)); + ASSERT(mp->m_sb.sb_blocksize == bp->b_bcount); - length = MIN(XFS_BUF_COUNT(bp) - hdrsize, valuelen - amountdone); + length = MIN(bp->b_bcount - hdrsize, valuelen - amountdone); memmove(value, bp->b_addr + hdrsize, length); amountdone += length; value += length; diff --git a/repair/dino_chunks.c b/repair/dino_chunks.c index 7d768a7c1..b4ede4618 100644 --- a/repair/dino_chunks.c +++ b/repair/dino_chunks.c @@ -677,7 +677,7 @@ process_inode_chunk( pftrace("readbuf %p (%llu, %d) in AG %d", bplist[bp_index], (long long)XFS_BUF_ADDR(bplist[bp_index]), - XFS_BUF_COUNT(bplist[bp_index]), agno); + bplist[bp_index]->b_bcount, agno); bplist[bp_index]->b_ops = &xfs_inode_buf_ops; diff --git a/repair/prefetch.c b/repair/prefetch.c index 210815f82..ebfcac2d7 100644 --- a/repair/prefetch.c +++ b/repair/prefetch.c @@ -405,7 +405,7 @@ pf_read_inode_dirs( if (bp->b_error) return; - for (icnt = 0; icnt < (XFS_BUF_COUNT(bp) >> mp->m_sb.sb_inodelog); icnt++) { + for (icnt = 0; icnt < (bp->b_bcount >> mp->m_sb.sb_inodelog); icnt++) { dino = xfs_make_iptr(mp, bp, icnt); /* -- 2.47.2