Commit 9343ee76 authored by Dave Chinner's avatar Dave Chinner Committed by Darrick J. Wong
Browse files

xfs: convert bp->b_bn references to xfs_buf_daddr() 



Stop directly referencing b_bn in code outside the buffer cache, as
b_bn is supposed to be used only as an internal cache index.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 04fcad80

fs/xfs/libxfs/xfs_ag.c

+0 −1
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ xfs_get_aghdr_buf( 
	if (error)

		return error;



	bp->b_bn = blkno;

	bp->b_maps[0].bm_bn = blkno;

	bp->b_ops = ops;

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2
Original line number Diff line number Diff line
@@ -1206,7 +1206,7 @@ xfs_attr3_leaf_to_node( 
	memcpy(bp2->b_addr, bp1->b_addr, args->geo->blksize);

	if (xfs_has_crc(mp)) {

		struct xfs_da3_blkinfo *hdr3 = bp2->b_addr;

		hdr3->blkno = cpu_to_be64(bp2->b_bn);

		hdr3->blkno = cpu_to_be64(xfs_buf_daddr(bp2));

	}

	xfs_trans_log_buf(args->trans, bp2, 0, args->geo->blksize - 1);
@@ -1274,7 +1274,7 @@ xfs_attr3_leaf_create( 


		ichdr.magic = XFS_ATTR3_LEAF_MAGIC;



		hdr3->blkno = cpu_to_be64(bp->b_bn);

		hdr3->blkno = cpu_to_be64(xfs_buf_daddr(bp));

		hdr3->owner = cpu_to_be64(dp->i_ino);

		uuid_copy(&hdr3->uuid, &mp->m_sb.sb_meta_uuid);

fs/xfs/libxfs/xfs_attr_remote.c

+4 −4
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ __xfs_attr3_rmt_read_verify( 
		return 0;



	ptr = bp->b_addr;

	bno = bp->b_bn;

	bno = xfs_buf_daddr(bp);

	len = BBTOB(bp->b_length);

	ASSERT(len >= blksize);
@@ -195,7 +195,7 @@ xfs_attr3_rmt_write_verify( 
		return;



	ptr = bp->b_addr;

	bno = bp->b_bn;

	bno = xfs_buf_daddr(bp);

	len = BBTOB(bp->b_length);

	ASSERT(len >= blksize);
@@ -284,7 +284,7 @@ xfs_attr_rmtval_copyout( 
	uint8_t		**dst)

{

	char		*src = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;

	xfs_daddr_t	bno = xfs_buf_daddr(bp);

	int		len = BBTOB(bp->b_length);

	int		blksize = mp->m_attr_geo->blksize;
@@ -332,7 +332,7 @@ xfs_attr_rmtval_copyin( 
	uint8_t		**src)

{

	char		*dst = bp->b_addr;

	xfs_daddr_t	bno = bp->b_bn;

	xfs_daddr_t	bno = xfs_buf_daddr(bp);

	int		len = BBTOB(bp->b_length);

	int		blksize = mp->m_attr_geo->blksize;

fs/xfs/libxfs/xfs_bmap.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ xfs_bmap_extents_to_btree( 
	 */

	abp->b_ops = &xfs_bmbt_buf_ops;

	ablock = XFS_BUF_TO_BLOCK(abp);

	xfs_btree_init_block_int(mp, ablock, abp->b_bn,

	xfs_btree_init_block_int(mp, ablock, xfs_buf_daddr(abp),

				XFS_BTNUM_BMAP, 0, 0, ip->i_ino,

				XFS_BTREE_LONG_PTRS);

fs/xfs/libxfs/xfs_btree.c

+13 −12
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ __xfs_btree_check_lblock( 
		if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return __this_address;

		if (block->bb_u.l.bb_blkno !=

		    cpu_to_be64(bp ? bp->b_bn : XFS_BUF_DADDR_NULL))

		    cpu_to_be64(bp ? xfs_buf_daddr(bp) : XFS_BUF_DADDR_NULL))

			return __this_address;

		if (block->bb_u.l.bb_pad != cpu_to_be32(0))

			return __this_address;
@@ -135,7 +135,7 @@ __xfs_btree_check_sblock( 
		if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

			return __this_address;

		if (block->bb_u.s.bb_blkno !=

		    cpu_to_be64(bp ? bp->b_bn : XFS_BUF_DADDR_NULL))

		    cpu_to_be64(bp ? xfs_buf_daddr(bp) : XFS_BUF_DADDR_NULL))

			return __this_address;

	}
@@ -1131,7 +1131,7 @@ xfs_btree_init_block( 
	__u16		numrecs,

	__u64		owner)

{

	xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,

	xfs_btree_init_block_int(mp, XFS_BUF_TO_BLOCK(bp), xfs_buf_daddr(bp),

				 btnum, level, numrecs, owner, 0);

}
@@ -1155,9 +1155,9 @@ xfs_btree_init_block_cur( 
	else

		owner = cur->bc_ag.pag->pag_agno;



	xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp), bp->b_bn,

				 cur->bc_btnum, level, numrecs,

				 owner, cur->bc_flags);

	xfs_btree_init_block_int(cur->bc_mp, XFS_BUF_TO_BLOCK(bp),

				xfs_buf_daddr(bp), cur->bc_btnum, level,

				numrecs, owner, cur->bc_flags);

}



/*
@@ -2923,10 +2923,11 @@ xfs_btree_new_iroot( 
	 */

	memcpy(cblock, block, xfs_btree_block_len(cur));

	if (cur->bc_flags & XFS_BTREE_CRC_BLOCKS) {

		__be64 bno = cpu_to_be64(xfs_buf_daddr(cbp));

		if (cur->bc_flags & XFS_BTREE_LONG_PTRS)

			cblock->bb_u.l.bb_blkno = cpu_to_be64(cbp->b_bn);

			cblock->bb_u.l.bb_blkno = bno;

		else

			cblock->bb_u.s.bb_blkno = cpu_to_be64(cbp->b_bn);

			cblock->bb_u.s.bb_blkno = bno;

	}



	be16_add_cpu(&block->bb_level, 1);
@@ -3225,7 +3226,7 @@ xfs_btree_insrec( 


	/* Get pointers to the btree buffer and block. */

	block = xfs_btree_get_block(cur, level, &bp);

	old_bn = bp ? bp->b_bn : XFS_BUF_DADDR_NULL;

	old_bn = bp ? xfs_buf_daddr(bp) : XFS_BUF_DADDR_NULL;

	numrecs = xfs_btree_get_numrecs(block);



#ifdef DEBUG
@@ -3341,7 +3342,7 @@ xfs_btree_insrec( 
	 * some records into the new tree block), so use the regular key

	 * update mechanism.

	 */

	if (bp && bp->b_bn != old_bn) {

	if (bp && xfs_buf_daddr(bp) != old_bn) {

		xfs_btree_get_keys(cur, block, lkey);

	} else if (xfs_btree_needs_key_update(cur, optr)) {

		error = xfs_btree_update_keys(cur, level);
@@ -4422,7 +4423,7 @@ xfs_btree_lblock_v5hdr_verify( 
		return __this_address;

	if (!uuid_equal(&block->bb_u.l.bb_uuid, &mp->m_sb.sb_meta_uuid))

		return __this_address;

	if (block->bb_u.l.bb_blkno != cpu_to_be64(bp->b_bn))

	if (block->bb_u.l.bb_blkno != cpu_to_be64(xfs_buf_daddr(bp)))

		return __this_address;

	if (owner != XFS_RMAP_OWN_UNKNOWN &&

	    be64_to_cpu(block->bb_u.l.bb_owner) != owner)
@@ -4472,7 +4473,7 @@ xfs_btree_sblock_v5hdr_verify( 
		return __this_address;

	if (!uuid_equal(&block->bb_u.s.bb_uuid, &mp->m_sb.sb_meta_uuid))

		return __this_address;

	if (block->bb_u.s.bb_blkno != cpu_to_be64(bp->b_bn))

	if (block->bb_u.s.bb_blkno != cpu_to_be64(xfs_buf_daddr(bp)))

		return __this_address;

	if (pag && be32_to_cpu(block->bb_u.s.bb_owner) != pag->pag_agno)

		return __this_address;