Commit 9b2b577e authored by Dave Chinner's avatar Dave Chinner Committed by Jialin Zhang
Browse files

xfs: introduce xfs_buf_daddr() 

mainline inclusion
from mainline-v5.14-rc4
commit 04fcad80
category: bugfix
bugzilla: 187526,https://gitee.com/openeuler/kernel/issues/I6WKVJ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04fcad80cd068731a779fb442f78234732683755



--------------------------------

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: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarGuo Xuenan <guoxuenan@huawei.com>
Reviewed-by: default avatarYang Erkun <yangerkun@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 31fdbd85

fs/xfs/libxfs/xfs_alloc_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,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;

fs/xfs/libxfs/xfs_attr.c

+2 −2
Original line number Diff line number Diff line
@@ -1313,7 +1313,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;
@@ -1328,7 +1328,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;

fs/xfs/libxfs/xfs_bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,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];

	}
@@ -248,7 +248,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;

	}

fs/xfs/libxfs/xfs_bmap_btree.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/xfs/libxfs/xfs_btree.c

+5 −5
Original line number Diff line number Diff line
@@ -423,7 +423,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) {
@@ -1195,10 +1195,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)));

	}

}
@@ -1742,7 +1742,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;

	}
@@ -4516,7 +4516,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;