From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v14 03/15] xfs: Hoist transaction handling in xfs_attr_node_remove_step
Date: Fri, 18 Dec 2020 00:29:05 -0700 [thread overview]
Message-ID: <20201218072917.16805-4-allison.henderson@oracle.com> (raw)
In-Reply-To: <20201218072917.16805-1-allison.henderson@oracle.com>
This patch hoists transaction handling in xfs_attr_node_remove to
xfs_attr_node_remove_step. This will help keep transaction handling in
higher level functions instead of buried in subfunctions when we
introduce delay attributes
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
---
fs/xfs/libxfs/xfs_attr.c | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index e93d76a..1969b88 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -1251,7 +1251,7 @@ xfs_attr_node_remove_step(
struct xfs_da_args *args,
struct xfs_da_state *state)
{
- int retval, error;
+ int error;
struct xfs_inode *dp = args->dp;
@@ -1265,25 +1265,6 @@ xfs_attr_node_remove_step(
if (error)
return error;
}
- retval = xfs_attr_node_remove_cleanup(args, state);
-
- /*
- * Check to see if the tree needs to be collapsed.
- */
- if (retval && (state->path.active > 1)) {
- error = xfs_da3_join(state);
- if (error)
- return error;
- error = xfs_defer_finish(&args->trans);
- if (error)
- return error;
- /*
- * Commit the Btree join operation and start a new trans.
- */
- error = xfs_trans_roll_inode(&args->trans, dp);
- if (error)
- return error;
- }
return error;
}
@@ -1299,7 +1280,7 @@ xfs_attr_node_removename(
struct xfs_da_args *args)
{
struct xfs_da_state *state = NULL;
- int error;
+ int retval, error;
struct xfs_inode *dp = args->dp;
trace_xfs_attr_node_removename(args);
@@ -1312,6 +1293,26 @@ xfs_attr_node_removename(
if (error)
goto out;
+ retval = xfs_attr_node_remove_cleanup(args, state);
+
+ /*
+ * Check to see if the tree needs to be collapsed.
+ */
+ if (retval && (state->path.active > 1)) {
+ error = xfs_da3_join(state);
+ if (error)
+ return error;
+ error = xfs_defer_finish(&args->trans);
+ if (error)
+ return error;
+ /*
+ * Commit the Btree join operation and start a new trans.
+ */
+ error = xfs_trans_roll_inode(&args->trans, dp);
+ if (error)
+ return error;
+ }
+
/*
* If the result is small enough, push it all into the inode.
*/
--
2.7.4
next prev parent reply other threads:[~2020-12-18 7:30 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 7:29 [PATCH v14 00/15] xfs: Delayed Attributes Allison Henderson
2020-12-18 7:29 ` [PATCH v14 01/15] xfs: Add helper xfs_attr_node_remove_step Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:48 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 02/15] xfs: Add xfs_attr_node_remove_cleanup Allison Henderson
2020-12-21 6:45 ` Chandan Babu R
2020-12-21 23:47 ` Allison Henderson
2020-12-22 16:50 ` Brian Foster
2020-12-18 7:29 ` Allison Henderson [this message]
2020-12-21 6:45 ` [PATCH v14 03/15] xfs: Hoist transaction handling in xfs_attr_node_remove_step Chandan Babu R
2020-12-21 21:51 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 04/15] xfs: Add delay ready attr remove routines Allison Henderson
2020-12-22 7:22 ` Chandan Babu R
2020-12-22 15:41 ` Allison Henderson
2020-12-23 4:05 ` Chandan Babu R
2020-12-22 17:11 ` Brian Foster
2020-12-22 17:20 ` Brian Foster
2020-12-22 18:44 ` Brian Foster
2020-12-23 5:20 ` Allison Henderson
2020-12-23 14:16 ` Brian Foster
2020-12-24 8:23 ` Allison Henderson
2021-01-04 17:52 ` Brian Foster
2021-01-05 18:10 ` Allison Henderson
2021-01-06 14:25 ` Brian Foster
2020-12-18 7:29 ` [PATCH v14 05/15] xfs: Add delay ready attr set routines Allison Henderson
2020-12-23 8:00 ` Chandan Babu R
2020-12-23 16:31 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 06/15] xfs: Add state machine tracepoints Allison Henderson
2021-01-05 4:50 ` Chandan Babu R
2021-01-05 21:06 ` Allison Henderson
2021-01-05 5:28 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 07/15] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2020-12-18 7:29 ` [PATCH v14 08/15] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-01-05 5:38 ` Darrick J. Wong
2021-01-05 20:15 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 09/15] xfs: Set up infastructure for deferred attribute operations Allison Henderson
2020-12-18 7:29 ` [PATCH v14 10/15] xfs: Skip flip flags for delayed attrs Allison Henderson
2020-12-18 7:29 ` [PATCH v14 11/15] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2020-12-18 7:29 ` [PATCH v14 12/15] xfs: Remove unused xfs_attr_*_args Allison Henderson
2020-12-18 7:29 ` [PATCH v14 13/15] xfs: Add delayed attributes error tag Allison Henderson
2020-12-18 7:29 ` [PATCH v14 14/15] xfs: Add delattr mount option Allison Henderson
2021-01-05 5:46 ` Darrick J. Wong
2021-01-05 21:49 ` Allison Henderson
2020-12-18 7:29 ` [PATCH v14 15/15] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-01-05 5:47 ` Darrick J. Wong
2021-01-05 21:07 ` Allison Henderson
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=20201218072917.16805-4-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