From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v5 06/14] xfsprogs: Factor up trans handling in xfs_attr3_leaf_flipflags
Date: Wed, 11 Dec 2019 21:17:55 -0700 [thread overview]
Message-ID: <20191212041803.14018-7-allison.henderson@oracle.com> (raw)
In-Reply-To: <20191212041803.14018-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>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxfs/xfs_attr.c | 14 ++++++++++++++
libxfs/xfs_attr_leaf.c | 5 -----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 153888d..32f6d8c 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -725,6 +725,13 @@ 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);
+ if (error)
+ return error;
/*
* Dismantle the "old" attribute/value pair by removing
@@ -1063,6 +1070,13 @@ 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);
+ if (error)
+ goto out;
/*
* Dismantle the "old" attribute/value pair by removing
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 7511eb1..19566da 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2898,10 +2898,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
next prev parent reply other threads:[~2019-12-12 4:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 4:17 [PATCH v5 00/14] xfsprogs: Delayed Ready Attributes Allison Collins
2019-12-12 4:17 ` [PATCH v5 01/14] xfsprogs: Remove all strlen in all xfs_attr_* functions for attr names Allison Collins
2019-12-12 4:17 ` [PATCH v5 02/14] xfsprogs: Replace attribute parameters with struct xfs_name Allison Collins
2019-12-12 4:17 ` [PATCH v5 03/14] xfsprogs: Embed struct xfs_name in xfs_da_args Allison Collins
2019-12-12 4:17 ` [PATCH v5 04/14] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2019-12-12 4:17 ` [PATCH v5 05/14] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-12-12 4:17 ` Allison Collins [this message]
2019-12-12 4:17 ` [PATCH v5 07/14] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2019-12-12 4:17 ` [PATCH v5 08/14] xfsprogs: Factor up xfs_attr_try_sf_addname Allison Collins
2019-12-12 4:17 ` [PATCH v5 09/14] xfsprogs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-12-12 4:17 ` [PATCH v5 10/14] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2019-12-12 4:18 ` [PATCH v5 11/14] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag Allison Collins
2019-12-12 4:18 ` [PATCH v5 12/14] xfsprogs: Check for -ENOATTR or -EEXIST Allison Collins
2019-12-12 4:18 ` [PATCH v5 13/14] xfsprogs: Add delay ready attr remove routines Allison Collins
2019-12-12 4:18 ` [PATCH v5 14/14] xfsprogs: Add delay ready attr set routines 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=20191212041803.14018-7-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).