Commit 7a7842a1 authored by Zhang Yi's avatar Zhang Yi Committed by Long Li
Browse files

xfs: factor out __xfs_da3_node_read() 

Offering: HULK
hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I76JSK



--------------------------------

Factor out a wrapper __xfs_da3_node_read() from xfs_da3_node_read()
which could pass flags parameter.

Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 1f403b90

fs/xfs/libxfs/xfs_da_btree.c

+3 −2
Original line number Diff line number Diff line
@@ -366,16 +366,17 @@ xfs_da3_node_set_type( 
}



int

xfs_da3_node_read(

__xfs_da3_node_read(

	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	unsigned int		flags,

	struct xfs_buf		**bpp,

	int			whichfork)

{

	int			error;



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

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

			&xfs_da3_node_buf_ops);

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

		return error;

fs/xfs/libxfs/xfs_da_btree.h

+13 −2
Original line number Diff line number Diff line
@@ -188,11 +188,22 @@ int xfs_da3_path_shift(xfs_da_state_t *state, xfs_da_state_path_t *path, 
 */

int	xfs_da3_blk_link(xfs_da_state_t *state, xfs_da_state_blk_t *old_blk,

				       xfs_da_state_blk_t *new_blk);

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

			xfs_dablk_t bno, struct xfs_buf **bpp, int whichfork);

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

			xfs_dablk_t bno, unsigned int flags,

			struct xfs_buf **bpp, int whichfork);

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

			xfs_daddr_t mappedbno, struct xfs_buf **bpp,

			int whichfork);

static inline int

xfs_da3_node_read(

	struct xfs_trans	*tp,

	struct xfs_inode	*dp,

	xfs_dablk_t		bno,

	struct xfs_buf		**bpp,

	int			whichfork)

{

	return __xfs_da3_node_read(tp, dp, bno, 0, bpp, whichfork);

}



/*

 * Utility routines.