Commit 2911edb6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove the mappedbno argument to xfs_da_get_buf 



Use the xfs_da_get_buf_daddr function directly for the two callers
that pass a mapped disk address, and then remove the mappedbno argument.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent cd2c9f1b

fs/xfs/libxfs/xfs_attr_leaf.c

+2 −2
Original line number Diff line number Diff line
@@ -1162,7 +1162,7 @@ xfs_attr3_leaf_to_node( 
	if (error)

		goto out;



	error = xfs_da_get_buf(args->trans, dp, blkno, -1, &bp2, XFS_ATTR_FORK);

	error = xfs_da_get_buf(args->trans, dp, blkno, &bp2, XFS_ATTR_FORK);

	if (error)

		goto out;
@@ -1223,7 +1223,7 @@ xfs_attr3_leaf_create( 


	trace_xfs_attr_leaf_create(args);



	error = xfs_da_get_buf(args->trans, args->dp, blkno, -1, &bp,

	error = xfs_da_get_buf(args->trans, args->dp, blkno, &bp,

					    XFS_ATTR_FORK);

	if (error)

		return error;

fs/xfs/libxfs/xfs_da_btree.c

+3 −15
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ xfs_da3_node_create( 
	trace_xfs_da_node_create(args);

	ASSERT(level <= XFS_DA_NODE_MAXDEPTH);



	error = xfs_da_get_buf(tp, dp, blkno, -1, &bp, whichfork);

	error = xfs_da_get_buf(tp, dp, blkno, &bp, whichfork);

	if (error)

		return error;

	bp->b_ops = &xfs_da3_node_buf_ops;
@@ -656,7 +656,7 @@ xfs_da3_root_split( 


	dp = args->dp;

	tp = args->trans;

	error = xfs_da_get_buf(tp, dp, blkno, -1, &bp, args->whichfork);

	error = xfs_da_get_buf(tp, dp, blkno, &bp, args->whichfork);

	if (error)

		return error;

	node = bp->b_addr;
@@ -2577,7 +2577,6 @@ xfs_da_get_buf( 
	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mappedbno,

	struct xfs_buf		**bpp,

	int			whichfork)

{
@@ -2588,22 +2587,11 @@ xfs_da_get_buf( 
	int			error;



	*bpp = NULL;



	if (mappedbno >= 0) {

		bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, mappedbno,

				XFS_FSB_TO_BB(mp,

					xfs_dabuf_nfsb(mp, whichfork)), 0);

		goto done;

	}



	error = xfs_dabuf_map(dp, bno,

			mappedbno == -1 ? XFS_DABUF_MAP_HOLE_OK : 0,

			whichfork, &mapp, &nmap);

	error = xfs_dabuf_map(dp, bno, 0, whichfork, &mapp, &nmap);

	if (error || nmap == 0)

		goto out_free;



	bp = xfs_trans_get_buf_map(tp, mp->m_ddev_targp, mapp, nmap, 0);

done:

	error = bp ? bp->b_error : -EIO;

	if (error) {

		if (bp)

fs/xfs/libxfs/xfs_da_btree.h

+1 −2
Original line number Diff line number Diff line
@@ -203,8 +203,7 @@ int xfs_da_grow_inode(xfs_da_args_t *args, xfs_dablk_t *new_blkno); 
int	xfs_da_grow_inode_int(struct xfs_da_args *args, xfs_fileoff_t *bno,

			      int count);

int	xfs_da_get_buf(struct xfs_trans *trans, struct xfs_inode *dp,

			      xfs_dablk_t bno, xfs_daddr_t mappedbno,

			      struct xfs_buf **bp, int whichfork);

		xfs_dablk_t bno, struct xfs_buf **bp, int whichfork);

int	xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp,

		xfs_dablk_t bno, unsigned int flags, struct xfs_buf **bpp,

		int whichfork, const struct xfs_buf_ops *ops);

fs/xfs/libxfs/xfs_dir2_data.c

+1 −1
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ xfs_dir3_data_init( 
	 * Get the buffer set up for the block.

	 */

	error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, blkno),

			       -1, &bp, XFS_DATA_FORK);

			       &bp, XFS_DATA_FORK);

	if (error)

		return error;

	bp->b_ops = &xfs_dir3_data_buf_ops;

fs/xfs/libxfs/xfs_dir2_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ xfs_dir3_leaf_get_buf( 
	       bno < xfs_dir2_byte_to_db(args->geo, XFS_DIR2_FREE_OFFSET));



	error = xfs_da_get_buf(tp, dp, xfs_dir2_db_to_da(args->geo, bno),

			       -1, &bp, XFS_DATA_FORK);

			       &bp, XFS_DATA_FORK);

	if (error)

		return error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE