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

xfs: remove the mappedbno argument to xfs_da_read_buf 



Move the code for reading an already mapped block into
xfs_da3_node_read_mapped, which is the only caller ever passing a block
number in the mappedbno argument and replace the mappedbno argument with
the simple xfs_dabuf_get flags.

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 02c57f0a

fs/xfs/libxfs/xfs_attr_leaf.c

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ xfs_attr3_leaf_read( 
{

	int			err;



	err = xfs_da_read_buf(tp, dp, bno, -1, bpp, XFS_ATTR_FORK,

	err = xfs_da_read_buf(tp, dp, bno, 0, bpp, XFS_ATTR_FORK,

			&xfs_attr3_leaf_buf_ops);

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

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_ATTR_LEAF_BUF);

fs/xfs/libxfs/xfs_da_btree.c

+16 −18
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ xfs_da3_node_read( 
{

	int			error;



	error = xfs_da_read_buf(tp, dp, bno, -1, bpp, whichfork,

	error = xfs_da_read_buf(tp, dp, bno, 0, bpp, whichfork,

			&xfs_da3_node_buf_ops);

	if (error || !*bpp || !tp)

		return error;
@@ -384,12 +384,22 @@ xfs_da3_node_read_mapped( 
	struct xfs_buf		**bpp,

	int			whichfork)

{

	struct xfs_mount	*mp = dp->i_mount;

	int			error;



	error = xfs_da_read_buf(tp, dp, 0, mappedbno, bpp, whichfork,

			&xfs_da3_node_buf_ops);

	if (error || !*bpp || !tp)

	error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp, mappedbno,

			XFS_FSB_TO_BB(mp, xfs_dabuf_nfsb(mp, whichfork)), 0,

			bpp, &xfs_da3_node_buf_ops);

	if (error || !*bpp)

		return error;



	if (whichfork == XFS_ATTR_FORK)

		xfs_buf_set_ref(*bpp, XFS_ATTR_BTREE_REF);

	else

		xfs_buf_set_ref(*bpp, XFS_DIR_BTREE_REF);



	if (!tp)

		return 0;

	return xfs_da3_node_set_type(tp, *bpp);

}
@@ -2618,7 +2628,7 @@ xfs_da_read_buf( 
	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mappedbno,

	unsigned int		flags,

	struct xfs_buf		**bpp,

	int			whichfork,

	const struct xfs_buf_ops *ops)
@@ -2630,24 +2640,12 @@ xfs_da_read_buf( 
	int			error;



	*bpp = NULL;



	if (mappedbno >= 0) {

		error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,

				mappedbno, XFS_FSB_TO_BB(mp,

					xfs_dabuf_nfsb(mp, whichfork)),

				0, &bp, ops);

		goto done;

	}



	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;



	error = xfs_trans_read_buf_map(mp, tp, mp->m_ddev_targp, mapp, nmap, 0,

			&bp, ops);

done:

	if (error)

		goto out_free;

fs/xfs/libxfs/xfs_da_btree.h

+2 −3
Original line number Diff line number Diff line
@@ -206,9 +206,8 @@ int xfs_da_get_buf(struct xfs_trans *trans, struct xfs_inode *dp, 
			      xfs_dablk_t bno, xfs_daddr_t mappedbno,

			      struct xfs_buf **bp, int whichfork);

int	xfs_da_read_buf(struct xfs_trans *trans, struct xfs_inode *dp,

			       xfs_dablk_t bno, xfs_daddr_t mappedbno,

			       struct xfs_buf **bpp, int whichfork,

			       const struct xfs_buf_ops *ops);

		xfs_dablk_t bno, unsigned int flags, 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,

		unsigned int flags, int whichfork,

		const struct xfs_buf_ops *ops);

fs/xfs/libxfs/xfs_dir2_block.c

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ xfs_dir3_block_read( 
	struct xfs_mount	*mp = dp->i_mount;

	int			err;



	err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, -1, bpp,

	err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, 0, bpp,

				XFS_DATA_FORK, &xfs_dir3_block_buf_ops);

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

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF);
@@ -950,7 +950,7 @@ xfs_dir2_leaf_to_block( 
	 * Read the data block if we don't already have it, give up if it fails.

	 */

	if (!dbp) {

		error = xfs_dir3_data_read(tp, dp, args->geo->datablk, -1, &dbp);

		error = xfs_dir3_data_read(tp, dp, args->geo->datablk, 0, &dbp);

		if (error)

			return error;

	}

fs/xfs/libxfs/xfs_dir2_data.c

+3 −3
Original line number Diff line number Diff line
@@ -400,13 +400,13 @@ xfs_dir3_data_read( 
	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	xfs_daddr_t		mapped_bno,

	unsigned int		flags,

	struct xfs_buf		**bpp)

{

	int			err;



	err = xfs_da_read_buf(tp, dp, bno, mapped_bno, bpp,

				XFS_DATA_FORK, &xfs_dir3_data_buf_ops);

	err = xfs_da_read_buf(tp, dp, bno, flags, bpp, XFS_DATA_FORK,

			&xfs_dir3_data_buf_ops);

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

		xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_DATA_BUF);

	return err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE