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

xfs: remove the mappedbno argument to xfs_attr3_leaf_read 



This argument is always hard coded to -1, so remove it.

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 06566fda

fs/xfs/libxfs/xfs_attr.c

+5 −5
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ xfs_attr_leaf_addname( 
	 */

	dp = args->dp;

	args->blkno = 0;

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);

	if (error)

		return error;
@@ -715,7 +715,7 @@ xfs_attr_leaf_addname( 
		 * remove the "old" attr from that block (neat, huh!)

		 */

		error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno,

					   -1, &bp);

					   &bp);

		if (error)

			return error;
@@ -769,7 +769,7 @@ xfs_attr_leaf_removename( 
	 */

	dp = args->dp;

	args->blkno = 0;

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);

	if (error)

		return error;
@@ -813,7 +813,7 @@ xfs_attr_leaf_get(xfs_da_args_t *args) 
	trace_xfs_attr_leaf_get(args);



	args->blkno = 0;

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);

	if (error)

		return error;
@@ -1173,7 +1173,7 @@ xfs_attr_node_removename( 
		ASSERT(state->path.blk[0].bp);

		state->path.blk[0].bp = NULL;



		error = xfs_attr3_leaf_read(args->trans, args->dp, 0, -1, &bp);

		error = xfs_attr3_leaf_read(args->trans, args->dp, 0, &bp);

		if (error)

			goto out;

fs/xfs/libxfs/xfs_attr_leaf.c

+8 −9
Original line number Diff line number Diff line
@@ -430,13 +430,12 @@ xfs_attr3_leaf_read( 
	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mappedbno,

	struct xfs_buf		**bpp)

{

	int			err;



	err = xfs_da_read_buf(tp, dp, bno, mappedbno, bpp,

				XFS_ATTR_FORK, &xfs_attr3_leaf_buf_ops);

	err = xfs_da_read_buf(tp, dp, bno, -1, bpp, XFS_ATTR_FORK,

			&xfs_attr3_leaf_buf_ops);

	if (!err && tp && *bpp)

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_ATTR_LEAF_BUF);

	return err;
@@ -1159,7 +1158,7 @@ xfs_attr3_leaf_to_node( 
	error = xfs_da_grow_inode(args, &blkno);

	if (error)

		goto out;

	error = xfs_attr3_leaf_read(args->trans, dp, 0, -1, &bp1);

	error = xfs_attr3_leaf_read(args->trans, dp, 0, &bp1);

	if (error)

		goto out;
@@ -1996,7 +1995,7 @@ xfs_attr3_leaf_toosmall( 
		if (blkno == 0)

			continue;

		error = xfs_attr3_leaf_read(state->args->trans, state->args->dp,

					blkno, -1, &bp);

					blkno, &bp);

		if (error)

			return error;
@@ -2732,7 +2731,7 @@ xfs_attr3_leaf_clearflag( 
	/*

	 * Set up the operation.

	 */

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);

	if (error)

		return error;
@@ -2799,7 +2798,7 @@ xfs_attr3_leaf_setflag( 
	/*

	 * Set up the operation.

	 */

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp);

	if (error)

		return error;
@@ -2861,7 +2860,7 @@ xfs_attr3_leaf_flipflags( 
	/*

	 * Read the block containing the "old" attr

	 */

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, -1, &bp1);

	error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno, &bp1);

	if (error)

		return error;
@@ -2870,7 +2869,7 @@ xfs_attr3_leaf_flipflags( 
	 */

	if (args->blkno2 != args->blkno) {

		error = xfs_attr3_leaf_read(args->trans, args->dp, args->blkno2,

					   -1, &bp2);

					   &bp2);

		if (error)

			return error;

	} else {

fs/xfs/libxfs/xfs_attr_leaf.h

+1 −2
Original line number Diff line number Diff line
@@ -108,8 +108,7 @@ int xfs_attr_leaf_order(struct xfs_buf *leaf1_bp, 
				   struct xfs_buf *leaf2_bp);

int	xfs_attr_leaf_newentsize(struct xfs_da_args *args, int *local);

int	xfs_attr3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,

			xfs_dablk_t bno, xfs_daddr_t mappedbno,

			struct xfs_buf **bpp);

			xfs_dablk_t bno, struct xfs_buf **bpp);

void	xfs_attr3_leaf_hdr_from_disk(struct xfs_da_geometry *geo,

				     struct xfs_attr3_icleaf_hdr *to,

				     struct xfs_attr_leafblock *from);

fs/xfs/xfs_attr_list.c

+3 −2
Original line number Diff line number Diff line
@@ -377,7 +377,8 @@ xfs_attr_node_list( 
			break;

		cursor->blkno = leafhdr.forw;

		xfs_trans_brelse(context->tp, bp);

		error = xfs_attr3_leaf_read(context->tp, dp, cursor->blkno, -1, &bp);

		error = xfs_attr3_leaf_read(context->tp, dp, cursor->blkno,

					    &bp);

		if (error)

			return error;

	}
@@ -495,7 +496,7 @@ xfs_attr_leaf_list(xfs_attr_list_context_t *context) 
	trace_xfs_attr_leaf_list(context);



	context->cursor->blkno = 0;

	error = xfs_attr3_leaf_read(context->tp, context->dp, 0, -1, &bp);

	error = xfs_attr3_leaf_read(context->tp, context->dp, 0, &bp);

	if (error)

		return error;