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

xfs: remove the mappedbno argument to xfs_dir3_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 dfb87594

fs/xfs/libxfs/xfs_dir2_leaf.c

+4 −5
Original line number Diff line number Diff line
@@ -262,13 +262,12 @@ xfs_dir3_leaf_read( 
	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		fbno,

	xfs_daddr_t		mappedbno,

	struct xfs_buf		**bpp)

{

	int			err;



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

				XFS_DATA_FORK, &xfs_dir3_leaf1_buf_ops);

	err = xfs_da_read_buf(tp, dp, fbno, -1, bpp, XFS_DATA_FORK,

			&xfs_dir3_leaf1_buf_ops);

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

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAF1_BUF);

	return err;
@@ -639,7 +638,7 @@ xfs_dir2_leaf_addname( 


	trace_xfs_dir2_leaf_addname(args);



	error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp);

	error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp);

	if (error)

		return error;
@@ -1230,7 +1229,7 @@ xfs_dir2_leaf_lookup_int( 
	tp = args->trans;

	mp = dp->i_mount;



	error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, -1, &lbp);

	error = xfs_dir3_leaf_read(tp, dp, args->geo->leafblk, &lbp);

	if (error)

		return error;

fs/xfs/libxfs/xfs_dir2_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ void xfs_dir2_leaf_hdr_from_disk(struct xfs_mount *mp, 
		struct xfs_dir3_icleaf_hdr *to, struct xfs_dir2_leaf *from);

void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to,

		struct xfs_dir3_icleaf_hdr *from);

extern int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,

		xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);

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

		xfs_dablk_t fbno, struct xfs_buf **bpp);

extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,

		xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);

extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args,

fs/xfs/scrub/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ xchk_directory_leaf1_bestfree( 
	int				error;



	/* Read the free space block. */

	error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, -1, &bp);

	error = xfs_dir3_leaf_read(sc->tp, sc->ip, lblk, &bp);

	if (!xchk_fblock_process_error(sc, XFS_DATA_FORK, lblk, &error))

		goto out;

	xchk_buffer_recheck(sc, bp);