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

xfs: remove the mappedbno argument to xfs_da_reada_buf 



Replace the mappedbno argument with the simple flags for xfs_da_reada_buf
and xfs_dir3_data_readahead.

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 199e9ba4

fs/xfs/libxfs/xfs_da_btree.c

+2 −8
Original line number Diff line number Diff line
@@ -2651,7 +2651,7 @@ int 
xfs_da_reada_buf(

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mappedbno,

	unsigned int		flags,

	int			whichfork,

	const struct xfs_buf_ops *ops)

{
@@ -2660,18 +2660,12 @@ xfs_da_reada_buf( 
	int			nmap;

	int			error;



	if (mappedbno >= 0)

		return -EINVAL;



	mapp = &map;

	nmap = 1;

	error = xfs_dabuf_map(dp, bno,

			mappedbno == -1 ? XFS_DABUF_MAP_HOLE_OK : 0,

			whichfork, &mapp, &nmap);

	error = xfs_dabuf_map(dp, bno, flags, whichfork, &mapp, &nmap);

	if (error || !nmap)

		goto out_free;



	mappedbno = mapp[0].bm_bn;

	xfs_buf_readahead_map(dp->i_mount->m_ddev_targp, mapp, nmap, ops);



out_free:

fs/xfs/libxfs/xfs_da_btree.h

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ int xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp, 
			       struct xfs_buf **bpp, int whichfork,

			       const struct xfs_buf_ops *ops);

int	xfs_da_reada_buf(struct xfs_inode *dp, xfs_dablk_t bno,

				xfs_daddr_t mapped_bno, int whichfork,

		unsigned int flags, int whichfork,

		const struct xfs_buf_ops *ops);

int	xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,

					  struct xfs_buf *dead_buf);

fs/xfs/libxfs/xfs_dir2_data.c

+3 −3
Original line number Diff line number Diff line
@@ -416,10 +416,10 @@ int 
xfs_dir3_data_readahead(

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mapped_bno)

	unsigned int		flags)

{

	return xfs_da_reada_buf(dp, bno, mapped_bno,

				XFS_DATA_FORK, &xfs_dir3_data_reada_buf_ops);

	return xfs_da_reada_buf(dp, bno, flags, XFS_DATA_FORK,

				&xfs_dir3_data_reada_buf_ops);

}



/*

fs/xfs/libxfs/xfs_dir2_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -79,8 +79,8 @@ extern xfs_failaddr_t __xfs_dir3_data_check(struct xfs_inode *dp, 
		struct xfs_buf *bp);

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

		xfs_dablk_t bno, xfs_daddr_t mapped_bno, struct xfs_buf **bpp);

extern int xfs_dir3_data_readahead(struct xfs_inode *dp, xfs_dablk_t bno,

		xfs_daddr_t mapped_bno);

int xfs_dir3_data_readahead(struct xfs_inode *dp, xfs_dablk_t bno,

		unsigned int flags);



extern struct xfs_dir2_data_free *

xfs_dir2_data_freeinsert(struct xfs_dir2_data_hdr *hdr,

fs/xfs/scrub/parent.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ xchk_parent_count_parent_dentries( 
	 */

	lock_mode = xfs_ilock_data_map_shared(parent);

	if (parent->i_d.di_nextents > 0)

		error = xfs_dir3_data_readahead(parent, 0, -1);

		error = xfs_dir3_data_readahead(parent, 0, 0);

	xfs_iunlock(parent, lock_mode);

	if (error)

		return error;