From: Allison Collins <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v10 09/25] xfs: Pull up trans roll in xfs_attr3_leaf_clearflag
Date: Thu, 25 Jun 2020 16:30:02 -0700 [thread overview]
Message-ID: <20200625233018.14585-10-allison.henderson@oracle.com> (raw)
In-Reply-To: <20200625233018.14585-1-allison.henderson@oracle.com>
New delayed allocation routines cannot be handling transactions so
pull them out into the calling functions
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>
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
---
fs/xfs/libxfs/xfs_attr.c | 16 ++++++++++++++++
fs/xfs/libxfs/xfs_attr_leaf.c | 5 +----
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 8d735210..df550b4 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -709,6 +709,14 @@ xfs_attr_leaf_addname(
* Added a "remote" value, just clear the incomplete flag.
*/
error = xfs_attr3_leaf_clearflag(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);
}
return error;
}
@@ -1073,6 +1081,14 @@ xfs_attr_node_addname(
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/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c
index c500eba8..351351c 100644
--- a/fs/xfs/libxfs/xfs_attr_leaf.c
+++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -2779,10 +2779,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 0;
}
/*
--
2.7.4
next prev parent reply other threads:[~2020-06-25 23:30 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-25 23:29 [PATCH v10 00/25] xfs: Delay Ready Attributes Allison Collins
2020-06-25 23:29 ` [PATCH v10 01/25] xfs: Add xfs_has_attr and subroutines Allison Collins
2020-06-25 23:29 ` [PATCH v10 02/25] xfs: Check for -ENOATTR or -EEXIST Allison Collins
2020-06-25 23:29 ` [PATCH v10 03/25] xfs: Factor out new helper functions xfs_attr_rmtval_set Allison Collins
2020-06-25 23:29 ` [PATCH v10 04/25] xfs: Pull up trans handling in xfs_attr3_leaf_flipflags Allison Collins
2020-06-25 23:29 ` [PATCH v10 05/25] xfs: Split apart xfs_attr_leaf_addname Allison Collins
2020-06-25 23:29 ` [PATCH v10 06/25] xfs: Refactor xfs_attr_try_sf_addname Allison Collins
2020-06-25 23:30 ` [PATCH v10 07/25] xfs: Pull up trans roll from xfs_attr3_leaf_setflag Allison Collins
2020-06-25 23:30 ` [PATCH v10 08/25] xfs: Factor out xfs_attr_rmtval_invalidate Allison Collins
2020-06-25 23:30 ` Allison Collins [this message]
2020-06-25 23:30 ` [PATCH v10 10/25] xfs: Refactor xfs_attr_rmtval_remove Allison Collins
2020-06-25 23:30 ` [PATCH v10 11/25] xfs: Pull up xfs_attr_rmtval_invalidate Allison Collins
2020-06-25 23:30 ` [PATCH v10 12/25] xfs: Add helper function xfs_attr_node_shrink Allison Collins
2020-06-25 23:30 ` [PATCH v10 13/25] xfs: Remove unneeded xfs_trans_roll_inode calls Allison Collins
2020-07-08 12:41 ` Brian Foster
2020-07-09 22:01 ` Allison Collins
2020-06-25 23:30 ` [PATCH v10 14/25] xfs: Remove xfs_trans_roll in xfs_attr_node_removename Allison Collins
2020-07-08 12:42 ` Brian Foster
2020-07-09 22:01 ` Allison Collins
2020-06-25 23:30 ` [PATCH v10 15/25] xfs: Add helpers xfs_attr_is_shortform and xfs_attr_set_shortform Allison Collins
2020-06-25 23:30 ` [PATCH v10 16/25] xfs: Add helper function xfs_attr_leaf_mark_incomplete Allison Collins
2020-06-25 23:30 ` [PATCH v10 17/25] xfs: Add remote block helper functions Allison Collins
2020-06-25 23:30 ` [PATCH v10 18/25] xfs: Add helper function xfs_attr_node_removename_setup Allison Collins
2020-06-25 23:30 ` [PATCH v10 19/25] xfs: Add helper function xfs_attr_node_removename_rmt Allison Collins
2020-06-25 23:30 ` [PATCH v10 20/25] xfs: Simplify xfs_attr_leaf_addname Allison Collins
2020-06-25 23:30 ` [PATCH v10 21/25] xfs: Simplify xfs_attr_node_addname Allison Collins
2020-06-25 23:30 ` [PATCH v10 22/25] xfs: Lift -ENOSPC handler from xfs_attr_leaf_addname Allison Collins
2020-06-25 23:30 ` [PATCH v10 23/25] xfs: Add delay ready attr remove routines Allison Collins
2020-07-09 13:24 ` Brian Foster
2020-07-09 18:04 ` Darrick J. Wong
2020-07-10 6:22 ` Allison Collins
2020-07-13 13:36 ` Brian Foster
2020-07-09 22:02 ` Allison Collins
2020-07-13 13:58 ` Brian Foster
2020-07-15 5:04 ` Allison Collins
2020-06-25 23:30 ` [PATCH v10 24/25] xfs: Add delay ready attr set routines Allison Collins
2020-06-25 23:30 ` [PATCH v10 25/25] xfs: Rename __xfs_attr_rmtval_remove 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=20200625233018.14585-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 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).