Unverified Commit c17394e0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14148 v2 xfs: revert fix patchs about attr inactive 

Merge Pull Request from: @ci-robot 
 
PR sync from: Long Li <leo.lilong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/3FZSKJ6BFVYGMPHAUKXZ7M7ATFN6TS4A/ 
This path set revert fix patchs about attr inactive. 

Long Li (2):
  Revert "xfs: atomic drop extent entries when inactiving attr"
  Revert "xfs: factor out __xfs_da3_node_read()"


-- 
2.39.2
 
https://gitee.com/openeuler/kernel/issues/IBALAU 
 
Link:https://gitee.com/openeuler/kernel/pulls/14148

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 0fc31598 ba90f41a

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.

fs/xfs/xfs_attr_inactive.c

+16 −46
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "xfs_quota.h"

#include "xfs_dir2.h"

#include "xfs_error.h"

#include "xfs_defer.h"



/*

 * Invalidate any incore buffers associated with this remote attribute value
@@ -140,8 +139,7 @@ xfs_attr3_node_inactive( 
	xfs_daddr_t		parent_blkno, child_blkno;

	struct xfs_buf		*child_bp;

	struct xfs_da3_icnode_hdr ichdr;

	int			error, i, done;

	xfs_filblks_t		count = mp->m_attr_geo->fsbcount;

	int			error, i;



	/*

	 * Since this code is recursive (gasp!) we must protect ourselves.
@@ -174,13 +172,10 @@ xfs_attr3_node_inactive( 
		 * traversal of the tree so we may deal with many blocks

		 * before we come back to this one.

		 */

		error = __xfs_da3_node_read(*trans, dp, child_fsb,

					    XFS_DABUF_MAP_HOLE_OK, &child_bp,

		error = xfs_da3_node_read(*trans, dp, child_fsb, &child_bp,

					  XFS_ATTR_FORK);

		if (error)

			return error;

		if (!child_bp)

			goto next_entry;



		/* save for re-read later */

		child_blkno = xfs_buf_daddr(child_bp);
@@ -212,32 +207,14 @@ xfs_attr3_node_inactive( 
		 * Remove the subsidiary block from the cache and from the log.

		 */

		error = xfs_trans_get_buf(*trans, mp->m_ddev_targp,

					  child_blkno, XFS_FSB_TO_BB(mp, count),

					  0, &child_bp);

				child_blkno,

				XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0,

				&child_bp);

		if (error)

			return error;



		error = xfs_bunmapi(*trans, dp, child_fsb, count,

				    XFS_BMAPI_ATTRFORK, 0, &done);

		if (error) {

			xfs_trans_brelse(*trans, child_bp);

			return error;

		}

		xfs_trans_binval(*trans, child_bp);



		error = xfs_defer_finish(trans);

		if (error)

			return error;

		child_bp = NULL;



		/*

		 * Atomically commit the whole invalidate stuff.

		 */

		error = xfs_trans_roll_inode(trans, dp);

		if (error)

			return  error;



next_entry:

		/*

		 * If we're not done, re-read the parent to get the next

		 * child block number.
@@ -255,6 +232,12 @@ xfs_attr3_node_inactive( 
			xfs_trans_brelse(*trans, bp);

			bp = NULL;

		}

		/*

		 * Atomically commit the whole invalidate stuff.

		 */

		error = xfs_trans_roll_inode(trans, dp);

		if (error)

			return  error;

	}



	return 0;
@@ -275,8 +258,7 @@ xfs_attr3_root_inactive( 
	struct xfs_da_blkinfo	*info;

	struct xfs_buf		*bp;

	xfs_daddr_t		blkno;

	xfs_filblks_t		count = mp->m_attr_geo->fsbcount;

	int			error, done;

	int			error;



	/*

	 * Read block 0 to see what we have to work with.
@@ -284,9 +266,8 @@ xfs_attr3_root_inactive( 
	 * the extents in reverse order the extent containing

	 * block 0 must still be there.

	 */

	error = __xfs_da3_node_read(*trans, dp, 0, XFS_DABUF_MAP_HOLE_OK,

				    &bp, XFS_ATTR_FORK);

	if (error || !bp)

	error = xfs_da3_node_read(*trans, dp, 0, &bp, XFS_ATTR_FORK);

	if (error)

		return error;

	blkno = bp->b_bn;
@@ -317,7 +298,7 @@ xfs_attr3_root_inactive( 
	 * Invalidate the incore copy of the root block.

	 */

	error = xfs_trans_get_buf(*trans, mp->m_ddev_targp, blkno,

				  XFS_FSB_TO_BB(mp, count), 0, &bp);

			XFS_FSB_TO_BB(mp, mp->m_attr_geo->fsbcount), 0, &bp);

	if (error)

		return error;

	error = bp->b_error;
@@ -325,17 +306,7 @@ xfs_attr3_root_inactive( 
		xfs_trans_brelse(*trans, bp);

		return error;

	}



	error = xfs_bunmapi(*trans, dp, 0, count, XFS_BMAPI_ATTRFORK, 0, &done);

	if (error) {

		xfs_trans_brelse(*trans, bp);

		return error;

	}

	xfs_trans_binval(*trans, bp);	/* remove from cache */



	error = xfs_defer_finish(trans);

	if (error)

		return error;

	/*

	 * Commit the invalidate and start the next transaction.

	 */
@@ -398,7 +369,6 @@ xfs_attr_inactive( 
		if (error)

			goto out_shutdown;



		/* Remove the potential leftover remote attr blocks. */

		error = xfs_itruncate_extents(&trans, dp, XFS_ATTR_FORK, 0);

		if (error)

			goto out_cancel;