From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v2 09/18] xfsprogs: Skip flip flags for delayed attrs
Date: Fri, 20 May 2022 12:00:22 -0700 [thread overview]
Message-ID: <20220520190031.2198236-10-allison.henderson@oracle.com> (raw)
In-Reply-To: <20220520190031.2198236-1-allison.henderson@oracle.com>
Source kernel commit: f38dc503d366b589d98d5676a5b279d10b47bcb9
This is a clean up patch that skips the flip flag logic for delayed attr
renames. Since the log replay keeps the inode locked, we do not need to
worry about race windows with attr lookups. So we can skip over
flipping the flag and the extra transaction roll for it
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 54 ++++++++++++++++++++++++++----------------
libxfs/xfs_attr_leaf.c | 3 ++-
2 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 76895d3329f8..6cda61adaca3 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -354,6 +354,7 @@ xfs_attr_set_iter(
struct xfs_inode *dp = args->dp;
struct xfs_buf *bp = NULL;
int forkoff, error = 0;
+ struct xfs_mount *mp = args->dp->i_mount;
/* State machine switch */
switch (dac->dela_state) {
@@ -476,16 +477,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the
* "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.
- */
- dac->dela_state = XFS_DAS_FLIP_LFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
- return -EAGAIN;
+ if (!xfs_has_larp(mp)) {
+ error = xfs_attr3_leaf_flipflags(args);
+ if (error)
+ return error;
+ /*
+ * Commit the flag value change and start the next trans
+ * in series.
+ */
+ dac->dela_state = XFS_DAS_FLIP_LFLAG;
+ trace_xfs_attr_set_iter_return(dac->dela_state,
+ args->dp);
+ return -EAGAIN;
+ }
+
+ fallthrough;
case XFS_DAS_FLIP_LFLAG:
/*
* Dismantle the "old" attribute/value pair by removing a
@@ -588,17 +594,21 @@ xfs_attr_set_iter(
* In a separate transaction, set the incomplete flag on the
* "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
- */
- dac->dela_state = XFS_DAS_FLIP_NFLAG;
- trace_xfs_attr_set_iter_return(dac->dela_state, args->dp);
- return -EAGAIN;
+ if (!xfs_has_larp(mp)) {
+ error = xfs_attr3_leaf_flipflags(args);
+ if (error)
+ goto out;
+ /*
+ * Commit the flag value change and start the next trans
+ * in series
+ */
+ dac->dela_state = XFS_DAS_FLIP_NFLAG;
+ trace_xfs_attr_set_iter_return(dac->dela_state,
+ args->dp);
+ return -EAGAIN;
+ }
+ fallthrough;
case XFS_DAS_FLIP_NFLAG:
/*
* Dismantle the "old" attribute/value pair by removing a
@@ -1232,6 +1242,7 @@ xfs_attr_node_addname_clear_incomplete(
{
struct xfs_da_args *args = dac->da_args;
struct xfs_da_state *state = NULL;
+ struct xfs_mount *mp = args->dp->i_mount;
int retval = 0;
int error = 0;
@@ -1239,7 +1250,8 @@ xfs_attr_node_addname_clear_incomplete(
* Re-find the "old" attribute entry after any split ops. The INCOMPLETE
* flag means that we will find the "old" attr, not the "new" one.
*/
- args->attr_filter |= XFS_ATTR_INCOMPLETE;
+ if (!xfs_has_larp(mp))
+ args->attr_filter |= XFS_ATTR_INCOMPLETE;
state = xfs_da_state_alloc(args);
state->inleaf = 0;
error = xfs_da3_node_lookup_int(state, &retval);
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 31eddb543308..45d1b0634db4 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -1484,7 +1484,8 @@ xfs_attr3_leaf_add_work(
if (tmp)
entry->flags |= XFS_ATTR_LOCAL;
if (args->op_flags & XFS_DA_OP_RENAME) {
- entry->flags |= XFS_ATTR_INCOMPLETE;
+ if (!xfs_has_larp(mp))
+ entry->flags |= XFS_ATTR_INCOMPLETE;
if ((args->blkno2 == args->blkno) &&
(args->index2 <= args->index)) {
args->index2++;
--
2.25.1
next prev parent reply other threads:[~2022-05-20 19:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-20 19:00 [PATCH v2 00/18] xfsprogs: Port larp, enable injects and log print for attri/d Allison Henderson
2022-05-20 19:00 ` [PATCH v2 01/18] xfsprogs: zero inode fork buffer at allocation Allison Henderson
2022-05-20 19:00 ` [PATCH v2 02/18] xfsprogs: hide log iovec alignment constraints Allison Henderson
2022-05-20 19:00 ` [PATCH v2 03/18] xfsprogs: don't commit the first deferred transaction without intents Allison Henderson
2022-05-20 19:00 ` [PATCH v2 04/18] xfsprogs: tag transactions that contain intent done items Allison Henderson
2022-05-20 19:00 ` [PATCH v2 05/18] xfsprogs: Fix double unlock in defer capture code Allison Henderson
2022-05-20 19:00 ` [PATCH v2 06/18] xfsprogs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2022-05-20 19:00 ` [PATCH v2 07/18] xfsprogs: Set up infrastructure for log attribute replay Allison Henderson
2022-05-20 19:00 ` [PATCH v2 08/18] xfsprogs: Implement attr logging and replay Allison Henderson
2022-05-20 19:00 ` Allison Henderson [this message]
2022-05-20 19:00 ` [PATCH v2 10/18] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2022-05-20 19:00 ` [PATCH v2 11/18] xfsprogs: Remove unused xfs_attr_*_args Allison Henderson
2022-05-20 19:00 ` [PATCH v2 12/18] xfsprogs: Add log attribute error tag Allison Henderson
2022-05-20 19:00 ` [PATCH v2 13/18] xfsprogs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2022-05-20 19:00 ` [PATCH v2 14/18] xfsprogs: Add helper function xfs_attr_leaf_addname Allison Henderson
2022-05-20 19:00 ` [PATCH v2 15/18] xfsprogs: Add helper function xfs_init_attr_trans Allison Henderson
2022-05-20 19:00 ` [PATCH v2 16/18] xfsprogs: add leaf split error tag Allison Henderson
2022-05-20 19:00 ` [PATCH v2 17/18] xfsprogs: add leaf to node " Allison Henderson
2022-05-20 19:00 ` [PATCH v2 18/18] xfs_logprint: Add log item printing for ATTRI and ATTRD Allison Henderson
2022-05-31 6:03 ` Dave Chinner
2022-06-01 1:39 ` Alli
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=20220520190031.2198236-10-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.