Commit ba90f41a authored by Long Li's avatar Long Li
Browse files

Revert "xfs: factor out __xfs_da3_node_read()" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBALAU


CVE: NA

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

This is a preparation patch, the real fix patch has been revereted,
so revert this patch as well.

This reverts commit ffb4f4fb.

Fixes: 8fd6df1c ("xfs: atomic drop extent entries when inactiving attr")
Signed-off-by: default avatarLong Li <leo.lilong@huawei.com>
parent 48416602

fs/xfs/libxfs/xfs_da_btree.c

+2 −3
Original line number Diff line number Diff line
@@ -366,17 +366,16 @@ 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, flags, bpp, whichfork,

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

			&xfs_da3_node_buf_ops);

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

		return error;

fs/xfs/libxfs/xfs_da_btree.h

+2 −13
Original line number Diff line number Diff line
@@ -187,22 +187,11 @@ 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, unsigned int flags,

			struct xfs_buf **bpp, int whichfork);

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_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.