From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v2 12/21] xfsprogs: Factor up trans roll in xfs_attr3_leaf_clearflag
Date: Thu, 5 Sep 2019 15:18:46 -0700 [thread overview]
Message-ID: <20190905221855.17555-13-allison.henderson@oracle.com> (raw)
In-Reply-To: <20190905221855.17555-1-allison.henderson@oracle.com>
New delayed allocation routines cannot be handling
transactions so factor them up into the calling functions
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
---
libxfs/xfs_attr.c | 14 ++++++++++++++
libxfs/xfs_attr_leaf.c | 5 +----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index a5b630c..3f354c8 100644
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -749,6 +749,12 @@ xfs_attr_leaf_addname(struct xfs_da_args *args)
* Added a "remote" value, just clear the incomplete flag.
*/
error = xfs_attr3_leaf_clearflag(args);
+
+ /*
+ * Commit the flag value change and start the next trans in
+ * series.
+ */
+ error = xfs_trans_roll_inode(&args->trans, args->dp);
}
return error;
}
@@ -1108,6 +1114,14 @@ restart:
error = xfs_attr3_leaf_clearflag(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;
}
retval = error = 0;
diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index b540ba9..338b0bd 100644
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -2724,10 +2724,7 @@ xfs_attr3_leaf_clearflag(
XFS_DA_LOGRANGE(leaf, name_rmt, sizeof(*name_rmt)));
}
- /*
- * Commit the flag value change and start the next trans in series.
- */
- return xfs_trans_roll_inode(&args->trans, args->dp);
+ return error;
}
/*
--
2.7.4
next prev parent reply other threads:[~2019-09-05 22:19 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 22:18 [PATCH v2 00/21] Delayed Attributes Allison Collins
2019-09-05 22:18 ` [PATCH v2 01/21] xfsprogs: Replace attribute parameters with struct xfs_name Allison Collins
2019-09-05 22:18 ` [PATCH v2 02/21] xfsprogs: Embed struct xfs_name in xfs_da_args Allison Collins
2019-09-05 22:18 ` [PATCH v2 03/21] xfsprogs: Add xfs_dabuf defines Allison Collins
2019-09-05 22:18 ` [PATCH v2 04/21] xfsprogs: Add xfs_has_attr and subroutines Allison Collins
2019-09-05 22:18 ` [PATCH v2 05/21] xfsprogs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2019-09-05 22:18 ` [PATCH v2 06/21] xfsprogs: Factor up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2019-09-05 22:18 ` [PATCH v2 07/21] xfsprogs: Factor out xfs_attr_leaf_addname helper Allison Collins
2019-09-05 22:18 ` [PATCH v2 08/21] xfsprogs: Factor up commit from xfs_attr_try_sf_addname Allison Collins
2019-09-05 22:18 ` [PATCH v2 09/21] xfsprogs: Factor up trans roll from xfs_attr3_leaf_setflag Allison Collins
2019-09-05 22:18 ` [PATCH v2 10/21] xfsprogs: Add xfs_attr3_leaf helper functions Allison Collins
2019-09-05 22:18 ` [PATCH v2 11/21] xfsprogs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2019-09-05 22:18 ` Allison Collins [this message]
2019-09-05 22:18 ` [PATCH v2 13/21] xfsprogs: Add delay context to xfs_da_args Allison Collins
2019-09-05 22:18 ` [PATCH v2 14/21] xfsprogs: Add delayed attribute routines Allison Collins
2019-09-05 22:18 ` [PATCH v2 15/21] xfsprogs: Set up infastructure for deferred attribute operations Allison Collins
2019-09-05 22:18 ` [PATCH v2 16/21] xfsprogs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Collins
2019-09-05 22:18 ` [PATCH v2 17/21] xfsprogs: Add feature bit XFS_SB_FEAT_INCOMPAT_LOG_DELATTR Allison Collins
2019-09-05 22:18 ` [PATCH v2 18/21] xfsprogs: Enable delayed attributes Allison Collins
2019-09-05 22:18 ` [PATCH v2 19/21] xfs_io: Add delayed attributes error tag Allison Collins
2019-09-05 22:18 ` [PATCH v2 20/21] xfsprogs: Add log item printing for ATTRI and ATTRD Allison Collins
2019-09-05 22:18 ` [PATCH v2 21/21] xfsprogs: Add delayed attribute flag to cmd 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=20190905221855.17555-13-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.