Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <hch@lst.de>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

authored by

Christoph Hellwig and committed by
Darrick J. Wong
f3fcb314 c943c0b2

+5 -7
+2 -3
fs/xfs/libxfs/xfs_dir2_leaf.c
··· 278 278 struct xfs_trans *tp, 279 279 struct xfs_inode *dp, 280 280 xfs_dablk_t fbno, 281 - xfs_daddr_t mappedbno, 282 281 struct xfs_buf **bpp) 283 282 { 284 283 int err; 285 284 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); 288 287 if (!err && tp && *bpp) 289 288 xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_LEAFN_BUF); 290 289 return err;
+1 -2
fs/xfs/libxfs/xfs_dir2_node.c
··· 1553 1553 /* 1554 1554 * Read the sibling leaf block. 1555 1555 */ 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); 1558 1557 if (error) 1559 1558 return error; 1560 1559
+2 -2
fs/xfs/libxfs/xfs_dir2_priv.h
··· 96 96 struct xfs_dir3_icleaf_hdr *from); 97 97 int xfs_dir3_leaf_read(struct xfs_trans *tp, struct xfs_inode *dp, 98 98 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); 101 101 extern int xfs_dir2_block_to_leaf(struct xfs_da_args *args, 102 102 struct xfs_buf *dbp); 103 103 extern int xfs_dir2_leaf_addname(struct xfs_da_args *args);