All of lore.kernel.org
 help / color / mirror / Atom feed
From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v1 07/19] xfsprogs: Factor up trans handling in xfs_attr3_leaf_flipflags
Date: Fri,  9 Aug 2019 14:37:52 -0700	[thread overview]
Message-ID: <20190809213804.32628-8-allison.henderson@oracle.com> (raw)
In-Reply-To: <20190809213804.32628-1-allison.henderson@oracle.com>

Since delayed operations cannot roll transactions, factor
up the transaction handling into the calling function

Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
 libxfs/xfs_attr.c      | 10 ++++++++++
 libxfs/xfs_attr_leaf.c |  5 -----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index f082b30..8b3d6a3 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -753,6 +753,11 @@ xfs_attr_leaf_addname(
 		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);
 
 		/*
 		 * Dismantle the "old" attribute/value pair by removing
@@ -1091,6 +1096,11 @@ restart:
 		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);
 
 		/*
 		 * Dismantle the "old" attribute/value pair by removing
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 2ebe2c6..1ac64dd 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2890,10 +2890,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;
 }
-- 
2.7.4

  parent reply	other threads:[~2019-08-09 21:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-09 21:37 [PATCH v1 00/19] Delayed Attributes Allison Collins
2019-08-09 21:37 ` [PATCH v1 01/19] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2019-08-09 21:37 ` [PATCH v1 02/19] xfsprog: Replace attribute parameters with struct xfs_name Allison Collins
2019-08-09 21:37 ` [PATCH v1 03/19] xfsprogs: Set up infastructure for deferred attribute operations Allison Collins
2019-08-09 21:37 ` [PATCH v1 04/19] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Collins
2019-08-09 21:37 ` [PATCH v1 05/19] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2019-08-09 21:37 ` [PATCH v1 06/19] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-08-09 21:37 ` Allison Collins [this message]
2019-08-09 21:37 ` [PATCH v1 08/19] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2019-08-09 21:37 ` [PATCH v1 09/19] xfsprogs: Factor up commit from xfs_attr_try_sf_addname Allison Collins
2019-08-09 21:37 ` [PATCH v1 10/19] xfsprogs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-08-09 21:37 ` [PATCH v1 11/19] xfsprogs: Add xfs_attr3_leaf helper functions Allison Collins
2019-08-09 21:37 ` [PATCH v1 12/19] xfsprogs: Factor out xfs_attr_rmtval_remove_value Allison Collins
2019-08-09 21:37 ` [PATCH v1 13/19] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2019-08-09 21:37 ` [PATCH v1 14/19] xfsprogs: Add delay context to xfs_da_args Allison Collins
2019-08-09 21:38 ` [PATCH v1 15/19] xfsprogs: Add delayed attribute routines Allison Collins
2019-08-09 21:38 ` [PATCH v1 16/19] xfsprogs: Roll delayed attr operations by returning EAGAIN Allison Collins
2019-08-09 21:38 ` [PATCH v1 17/19] xfsprogs: Enable delayed attributes Allison Collins
2019-08-09 21:38 ` [PATCH v1 18/19] xfsprogs: Add delayed attributes error tag Allison Collins
2019-08-12 16:44   ` Darrick J. Wong
2019-08-12 22:39     ` Allison Collins
2019-08-09 21:38 ` [PATCH v1 19/19] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Collins
2019-08-12 16:46   ` Darrick J. Wong
2019-08-12 23:34     ` Allison Collins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190809213804.32628-8-allison.henderson@oracle.com \
    --to=allison.henderson@oracle.com \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.