xfs: Pull up trans handling in xfs_attr3_leaf_flipflags (e3be1272) · Commits · 戴 / test

Since delayed operations cannot roll transactions, pull up the transaction handling into the calling function Signed-off-by:

fs/xfs/libxfs/xfs_attr.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -620,6 +620,13 @@ xfs_attr_leaf_addname(
		* "old" attr and clear the incomplete flag on the "new" attr.
		*/
		error = xfs_attr3_leaf_flipflags(args);
		if (error)
		return error;
		/*
		* Commit the flag value change and start the next trans in
		* series.
		*/
		error = xfs_trans_roll_inode(&args->trans, args->dp);
		if (error)
		return error;

		@@ -961,6 +968,13 @@ restart:
		* "old" attr and clear the incomplete flag on the "new" attr.
		*/
		error = xfs_attr3_leaf_flipflags(args);
		if (error)
		goto out;
		/*
		* Commit the flag value change and start the next trans in
		* series
		*/
		error = xfs_trans_roll_inode(&args->trans, args->dp);
		if (error)
		goto out;

+1 −6

Original line number	Diff line number	Diff line
		@@ -2951,10 +2951,5 @@ xfs_attr3_leaf_flipflags(
		XFS_DA_LOGRANGE(leaf2, name_rmt, sizeof(*name_rmt)));
		}

		/*
		* Commit the flag value change and start the next trans in series.
		*/
		error = xfs_trans_roll_inode(&args->trans, args->dp);

		return error;
		return 0;
		}