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

xfs: remove the mappedbno argument to xfs_dir3_leafn_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 c943c0b2

fs/xfs/libxfs/xfs_dir2_leaf.c

+2 −3
Original line number Diff line number Diff line
@@ -278,13 +278,12 @@ xfs_dir3_leafn_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_leafn_buf_ops);

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

			&xfs_dir3_leafn_buf_ops);

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

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAFN_BUF);

	return err;

fs/xfs/libxfs/xfs_dir2_node.c

+1 −2
Original line number Diff line number Diff line
@@ -1553,8 +1553,7 @@ xfs_dir2_leafn_toosmall( 
		/*

		 * Read the sibling leaf block.

		 */

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

					    blkno, -1, &bp);

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

		if (error)

			return error;

fs/xfs/libxfs/xfs_dir2_priv.h

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

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);

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

		xfs_dablk_t fbno, struct xfs_buf **bpp);

extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args,

		struct xfs_buf *dbp);

extern int xfs_dir2_leaf_addname(struct xfs_da_args *args);

CRA Git | Maintained and supported by SUSTech CRA and CCSE