Skip to content

Commit f3fcb31

Browse files
Christoph Hellwigdjwong
authored andcommitted
xfs: remove the mappedbno argument to xfs_dir3_leafn_read
This argument is always hard coded to -1, so remove it. Signed-off-by: Christoph Hellwig <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
1 parent c943c0b commit f3fcb31

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

fs/xfs/libxfs/xfs_dir2_leaf.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,13 +278,12 @@ xfs_dir3_leafn_read(
278278
struct xfs_trans *tp,
279279
struct xfs_inode *dp,
280280
xfs_dablk_t fbno,
281-
xfs_daddr_t mappedbno,
282281
struct xfs_buf **bpp)
283282
{
284283
int err;
285284

286-
err = xfs_da_read_buf(tp, dp, fbno, mappedbno, bpp,
287-
XFS_DATA_FORK, &xfs_dir3_leafn_buf_ops);
285+
err = xfs_da_read_buf(tp, dp, fbno, -1, bpp, XFS_DATA_FORK,
286+
&xfs_dir3_leafn_buf_ops);
288287
if (!err && tp && *bpp)
289288
xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAFN_BUF);
290289
return err;

fs/xfs/libxfs/xfs_dir2_node.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1553,8 +1553,7 @@ xfs_dir2_leafn_toosmall(
15531553
/*
15541554
* Read the sibling leaf block.
15551555
*/
1556-
error = xfs_dir3_leafn_read(state->args->trans, dp,
1557-
blkno, -1, &bp);
1556+
error = xfs_dir3_leafn_read(state->args->trans, dp, blkno, &bp);
15581557
if (error)
15591558
return error;
15601559

fs/xfs/libxfs/xfs_dir2_priv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ void xfs_dir2_leaf_hdr_to_disk(struct xfs_mount *mp, struct xfs_dir2_leaf *to,
9696
struct xfs_dir3_icleaf_hdr *from);
9797
int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp,
9898
xfs_dablk_t fbno, struct xfs_buf **bpp);
99-
extern int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,
100-
xfs_dablk_t fbno, xfs_daddr_t mappedbno, struct xfs_buf **bpp);
99+
int xfs_dir3_leafn_read(struct xfs_trans *tp, struct xfs_inode *dp,
100+
xfs_dablk_t fbno, struct xfs_buf **bpp);
101101
extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args,
102102
struct xfs_buf *dbp);
103103
extern int xfs_dir2_leaf_addname(struct xfs_da_args *args);

0 commit comments

Comments
 (0)