mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-12 23:33:55 +08:00
xfs: introduce xfs_buf_daddr()
Introduce a helper function xfs_buf_daddr() to extract the disk address of the buffer from the struct xfs_buf. This will replace direct accesses to bp->b_bn and bp->b_maps[0].bm_bn, as well as the XFS_BUF_ADDR() macro. This patch introduces the helper function and replaces all uses of XFS_BUF_ADDR() as this is just a simple sed replacement. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
parent
cf28e17c91
commit
04fcad80cd
@ -87,7 +87,7 @@ xfs_allocbt_free_block(
|
||||
xfs_agblock_t bno;
|
||||
int error;
|
||||
|
||||
bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));
|
||||
bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp));
|
||||
error = xfs_alloc_put_freelist(cur->bc_tp, agbp, NULL, bno, 1);
|
||||
if (error)
|
||||
return error;
|
||||
|
@ -1540,7 +1540,7 @@ xfs_attr_fillstate(xfs_da_state_t *state)
|
||||
ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));
|
||||
for (blk = path->blk, level = 0; level < path->active; blk++, level++) {
|
||||
if (blk->bp) {
|
||||
blk->disk_blkno = XFS_BUF_ADDR(blk->bp);
|
||||
blk->disk_blkno = xfs_buf_daddr(blk->bp);
|
||||
blk->bp = NULL;
|
||||
} else {
|
||||
blk->disk_blkno = 0;
|
||||
@ -1555,7 +1555,7 @@ xfs_attr_fillstate(xfs_da_state_t *state)
|
||||
ASSERT((path->active >= 0) && (path->active < XFS_DA_NODE_MAXDEPTH));
|
||||
for (blk = path->blk, level = 0; level < path->active; blk++, level++) {
|
||||
if (blk->bp) {
|
||||
blk->disk_blkno = XFS_BUF_ADDR(blk->bp);
|
||||
blk->disk_blkno = xfs_buf_daddr(blk->bp);
|
||||
blk->bp = NULL;
|
||||
} else {
|
||||
blk->disk_blkno = 0;
|
||||
|
@ -242,7 +242,7 @@ xfs_bmap_get_bp(
|
||||
for (i = 0; i < XFS_BTREE_MAXLEVELS; i++) {
|
||||
if (!cur->bc_bufs[i])
|
||||
break;
|
||||
if (XFS_BUF_ADDR(cur->bc_bufs[i]) == bno)
|
||||
if (xfs_buf_daddr(cur->bc_bufs[i]) == bno)
|
||||
return cur->bc_bufs[i];
|
||||
}
|
||||
|
||||
@ -251,7 +251,7 @@ xfs_bmap_get_bp(
|
||||
struct xfs_buf_log_item *bip = (struct xfs_buf_log_item *)lip;
|
||||
|
||||
if (bip->bli_item.li_type == XFS_LI_BUF &&
|
||||
XFS_BUF_ADDR(bip->bli_buf) == bno)
|
||||
xfs_buf_daddr(bip->bli_buf) == bno)
|
||||
return bip->bli_buf;
|
||||
}
|
||||
|
||||
|
@ -282,7 +282,7 @@ xfs_bmbt_free_block(
|
||||
struct xfs_mount *mp = cur->bc_mp;
|
||||
struct xfs_inode *ip = cur->bc_ino.ip;
|
||||
struct xfs_trans *tp = cur->bc_tp;
|
||||
xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, XFS_BUF_ADDR(bp));
|
||||
xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
|
||||
struct xfs_owner_info oinfo;
|
||||
|
||||
xfs_rmap_ino_bmbt_owner(&oinfo, ip->i_ino, cur->bc_ino.whichfork);
|
||||
|
@ -420,7 +420,7 @@ xfs_btree_dup_cursor(
|
||||
bp = cur->bc_bufs[i];
|
||||
if (bp) {
|
||||
error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
|
||||
XFS_BUF_ADDR(bp), mp->m_bsize,
|
||||
xfs_buf_daddr(bp), mp->m_bsize,
|
||||
0, &bp,
|
||||
cur->bc_ops->buf_ops);
|
||||
if (error) {
|
||||
@ -1192,10 +1192,10 @@ xfs_btree_buf_to_ptr(
|
||||
{
|
||||
if (cur->bc_flags & XFS_BTREE_LONG_PTRS)
|
||||
ptr->l = cpu_to_be64(XFS_DADDR_TO_FSB(cur->bc_mp,
|
||||
XFS_BUF_ADDR(bp)));
|
||||
xfs_buf_daddr(bp)));
|
||||
else {
|
||||
ptr->s = cpu_to_be32(xfs_daddr_to_agbno(cur->bc_mp,
|
||||
XFS_BUF_ADDR(bp)));
|
||||
xfs_buf_daddr(bp)));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1739,7 +1739,7 @@ xfs_btree_lookup_get_block(
|
||||
error = xfs_btree_ptr_to_daddr(cur, pp, &daddr);
|
||||
if (error)
|
||||
return error;
|
||||
if (bp && XFS_BUF_ADDR(bp) == daddr) {
|
||||
if (bp && xfs_buf_daddr(bp) == daddr) {
|
||||
*blkp = XFS_BUF_TO_BLOCK(bp);
|
||||
return 0;
|
||||
}
|
||||
@ -4499,7 +4499,7 @@ xfs_btree_sblock_verify(
|
||||
return __this_address;
|
||||
|
||||
/* sibling pointer verification */
|
||||
agno = xfs_daddr_to_agno(mp, XFS_BUF_ADDR(bp));
|
||||
agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));
|
||||
if (block->bb_u.s.bb_leftsib != cpu_to_be32(NULLAGBLOCK) &&
|
||||
!xfs_verify_agbno(mp, agno, be32_to_cpu(block->bb_u.s.bb_leftsib)))
|
||||
return __this_address;
|
||||
|
@ -156,7 +156,7 @@ __xfs_inobt_free_block(
|
||||
{
|
||||
xfs_inobt_mod_blockcount(cur, -1);
|
||||
return xfs_free_extent(cur->bc_tp,
|
||||
XFS_DADDR_TO_FSB(cur->bc_mp, XFS_BUF_ADDR(bp)), 1,
|
||||
XFS_DADDR_TO_FSB(cur->bc_mp, xfs_buf_daddr(bp)), 1,
|
||||
&XFS_RMAP_OINFO_INOBT, resv);
|
||||
}
|
||||
|
||||
|
@ -48,7 +48,7 @@ xfs_inode_buf_verify(
|
||||
/*
|
||||
* Validate the magic number and version of every inode in the buffer
|
||||
*/
|
||||
agno = xfs_daddr_to_agno(mp, XFS_BUF_ADDR(bp));
|
||||
agno = xfs_daddr_to_agno(mp, xfs_buf_daddr(bp));
|
||||
ni = XFS_BB_TO_FSB(mp, bp->b_length) * mp->m_sb.sb_inopblock;
|
||||
for (i = 0; i < ni; i++) {
|
||||
int di_ok;
|
||||
|
@ -102,7 +102,7 @@ xfs_refcountbt_free_block(
|
||||
struct xfs_mount *mp = cur->bc_mp;
|
||||
struct xfs_buf *agbp = cur->bc_ag.agbp;
|
||||
struct xfs_agf *agf = agbp->b_addr;
|
||||
xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, XFS_BUF_ADDR(bp));
|
||||
xfs_fsblock_t fsbno = XFS_DADDR_TO_FSB(mp, xfs_buf_daddr(bp));
|
||||
int error;
|
||||
|
||||
trace_xfs_refcountbt_free_block(cur->bc_mp, cur->bc_ag.pag->pag_agno,
|
||||
|
@ -122,7 +122,7 @@ xfs_rmapbt_free_block(
|
||||
xfs_agblock_t bno;
|
||||
int error;
|
||||
|
||||
bno = xfs_daddr_to_agbno(cur->bc_mp, XFS_BUF_ADDR(bp));
|
||||
bno = xfs_daddr_to_agbno(cur->bc_mp, xfs_buf_daddr(bp));
|
||||
trace_xfs_rmapbt_free_block(cur->bc_mp, pag->pag_agno,
|
||||
bno, 1);
|
||||
be32_add_cpu(&agf->agf_rmap_blocks, -1);
|
||||
|
@ -192,7 +192,7 @@ xfs_validate_sb_write(
|
||||
* secondary superblocks, so allow this usage to continue because
|
||||
* we never read counters from such superblocks.
|
||||
*/
|
||||
if (XFS_BUF_ADDR(bp) == XFS_SB_DADDR && !sbp->sb_inprogress &&
|
||||
if (xfs_buf_daddr(bp) == XFS_SB_DADDR && !sbp->sb_inprogress &&
|
||||
(sbp->sb_fdblocks > sbp->sb_dblocks ||
|
||||
!xfs_verify_icount(mp, sbp->sb_icount) ||
|
||||
sbp->sb_ifree > sbp->sb_icount)) {
|
||||
|
@ -435,12 +435,12 @@ xchk_btree_check_owner(
|
||||
if (!co)
|
||||
return -ENOMEM;
|
||||
co->level = level;
|
||||
co->daddr = XFS_BUF_ADDR(bp);
|
||||
co->daddr = xfs_buf_daddr(bp);
|
||||
list_add_tail(&co->list, &bs->to_check);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return xchk_btree_check_block_owner(bs, level, XFS_BUF_ADDR(bp));
|
||||
return xchk_btree_check_block_owner(bs, level, xfs_buf_daddr(bp));
|
||||
}
|
||||
|
||||
/* Decide if we want to check minrecs of a btree block in the inode root. */
|
||||
|
@ -177,7 +177,7 @@ xfs_attr3_node_inactive(
|
||||
return error;
|
||||
|
||||
/* save for re-read later */
|
||||
child_blkno = XFS_BUF_ADDR(child_bp);
|
||||
child_blkno = xfs_buf_daddr(child_bp);
|
||||
|
||||
/*
|
||||
* Invalidate the subtree, however we have to.
|
||||
|
@ -1335,7 +1335,7 @@ xfs_buf_ioerror_alert(
|
||||
{
|
||||
xfs_buf_alert_ratelimited(bp, "XFS: metadata IO error",
|
||||
"metadata I/O error in \"%pS\" at daddr 0x%llx len %d error %d",
|
||||
func, (uint64_t)XFS_BUF_ADDR(bp),
|
||||
func, (uint64_t)xfs_buf_daddr(bp),
|
||||
bp->b_length, -bp->b_error);
|
||||
}
|
||||
|
||||
|
@ -311,9 +311,13 @@ extern void xfs_buf_terminate(void);
|
||||
* In future, uncached buffers will pass the block number directly to the io
|
||||
* request function and hence these macros will go away at that point.
|
||||
*/
|
||||
#define XFS_BUF_ADDR(bp) ((bp)->b_maps[0].bm_bn)
|
||||
#define XFS_BUF_SET_ADDR(bp, bno) ((bp)->b_maps[0].bm_bn = (xfs_daddr_t)(bno))
|
||||
|
||||
static inline xfs_daddr_t xfs_buf_daddr(struct xfs_buf *bp)
|
||||
{
|
||||
return bp->b_maps[0].bm_bn;
|
||||
}
|
||||
|
||||
void xfs_buf_set_ref(struct xfs_buf *bp, int lru_ref);
|
||||
|
||||
/*
|
||||
|
@ -38,7 +38,7 @@ xfs_trans_buf_item_match(
|
||||
blip = (struct xfs_buf_log_item *)lip;
|
||||
if (blip->bli_item.li_type == XFS_LI_BUF &&
|
||||
blip->bli_buf->b_target == target &&
|
||||
XFS_BUF_ADDR(blip->bli_buf) == map[0].bm_bn &&
|
||||
xfs_buf_daddr(blip->bli_buf) == map[0].bm_bn &&
|
||||
blip->bli_buf->b_length == len) {
|
||||
ASSERT(blip->bli_buf->b_map_count == nmaps);
|
||||
return blip->bli_buf;
|
||||
|
Loading…
Reference in New Issue
Block a user