From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v22 16/16] xfs: Add helper function xfs_attr_leaf_addname
Date: Mon, 26 Jul 2021 23:20:53 -0700 [thread overview]
Message-ID: <20210727062053.11129-17-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210727062053.11129-1-allison.henderson@oracle.com>
This patch adds a helper function xfs_attr_leaf_addname. While this
does help to break down xfs_attr_set_iter, it does also hoist out some
of the state management. This patch has been moved to the end of the
clean up series for further discussion.
Suggested-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_attr.c | 108 ++++++++++++++++++++++++++---------------------
fs/xfs/xfs_trace.h | 1 +
2 files changed, 61 insertions(+), 48 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 811288d..acb995b 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -285,6 +285,65 @@ xfs_attr_sf_addname(
return -EAGAIN;
}
+STATIC int
+xfs_attr_leaf_addname(
+ struct xfs_attr_item *attr)
+{
+ struct xfs_da_args *args = attr->xattri_da_args;
+ struct xfs_buf *leaf_bp = attr->xattri_leaf_bp;
+ struct xfs_inode *dp = args->dp;
+ int error;
+
+ if (xfs_attr_is_leaf(dp)) {
+ error = xfs_attr_leaf_try_add(args, leaf_bp);
+ if (error == -ENOSPC) {
+ error = xfs_attr3_leaf_to_node(args);
+ if (error)
+ return error;
+
+ /*
+ * Finish any deferred work items and roll the
+ * transaction once more. The goal here is to call
+ * node_addname with the inode and transaction in the
+ * same state (inode locked and joined, transaction
+ * clean) no matter how we got to this step.
+ *
+ * At this point, we are still in XFS_DAS_UNINIT, but
+ * when we come back, we'll be a node, so we'll fall
+ * down into the node handling code below
+ */
+ trace_xfs_attr_set_iter_return(
+ attr->xattri_dela_state, args->dp);
+ return -EAGAIN;
+ }
+
+ if (error)
+ return error;
+
+ attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
+ } else {
+ error = xfs_attr_node_addname_find_attr(attr);
+ if (error)
+ return error;
+
+ error = xfs_attr_node_addname(attr);
+ if (error)
+ return error;
+
+ /*
+ * If addname was successful, and we dont need to alloc or
+ * remove anymore blks, we're done.
+ */
+ if (!args->rmtblkno && !args->rmtblkno2)
+ return 0;
+
+ attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
+ }
+
+ trace_xfs_attr_leaf_addname_return(attr->xattri_dela_state, args->dp);
+ return -EAGAIN;
+}
+
/*
* Set the attribute specified in @args.
* This routine is meant to function as a delayed operation, and may return
@@ -320,55 +379,8 @@ xfs_attr_set_iter(
*leaf_bp = NULL;
}
- if (xfs_attr_is_leaf(dp)) {
- error = xfs_attr_leaf_try_add(args, *leaf_bp);
- if (error == -ENOSPC) {
- error = xfs_attr3_leaf_to_node(args);
- if (error)
- return error;
-
- /*
- * Finish any deferred work items and roll the
- * transaction once more. The goal here is to
- * call node_addname with the inode and
- * transaction in the same state (inode locked
- * and joined, transaction clean) no matter how
- * we got to this step.
- *
- * At this point, we are still in
- * XFS_DAS_UNINIT, but when we come back, we'll
- * be a node, so we'll fall down into the node
- * handling code below
- */
- trace_xfs_attr_set_iter_return(
- attr->xattri_dela_state, args->dp);
- return -EAGAIN;
- } else if (error) {
- return error;
- }
-
- attr->xattri_dela_state = XFS_DAS_FOUND_LBLK;
- } else {
- error = xfs_attr_node_addname_find_attr(attr);
- if (error)
- return error;
+ return xfs_attr_leaf_addname(attr);
- error = xfs_attr_node_addname(attr);
- if (error)
- return error;
-
- /*
- * If addname was successful, and we dont need to alloc
- * or remove anymore blks, we're done.
- */
- if (!args->rmtblkno && !args->rmtblkno2)
- return 0;
-
- attr->xattri_dela_state = XFS_DAS_FOUND_NBLK;
- }
- trace_xfs_attr_set_iter_return(attr->xattri_dela_state,
- args->dp);
- return -EAGAIN;
case XFS_DAS_FOUND_LBLK:
/*
* If there was an out-of-line value, allocate the blocks we
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index f9840dd..cf8bd3a 100644
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -4008,6 +4008,7 @@ DEFINE_EVENT(xfs_das_state_class, name, \
TP_ARGS(das, ip))
DEFINE_DAS_STATE_EVENT(xfs_attr_sf_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_set_iter_return);
+DEFINE_DAS_STATE_EVENT(xfs_attr_leaf_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_node_addname_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_remove_iter_return);
DEFINE_DAS_STATE_EVENT(xfs_attr_rmtval_remove_return);
--
2.7.4
next prev parent reply other threads:[~2021-07-27 6:21 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 6:20 [PATCH v22 00/16] Delayed Attributes Allison Henderson
2021-07-27 6:20 ` [PATCH v22 01/16] xfs: allow setting and clearing of log incompat feature flags Allison Henderson
2021-07-27 12:24 ` Chandan Babu R
2021-07-28 9:01 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 02/16] xfs: clear log incompat feature bits when the log is idle Allison Henderson
2021-07-27 12:46 ` Chandan Babu R
2021-07-28 9:02 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 03/16] xfs: refactor xfs_iget calls from log intent recovery Allison Henderson
2021-07-28 11:54 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 04/16] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2021-07-27 23:30 ` Darrick J. Wong
2021-07-28 9:01 ` Allison Henderson
2021-07-28 12:18 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-08-09 17:24 ` Darrick J. Wong
2021-07-27 6:20 ` [PATCH v22 05/16] xfs: Add state machine tracepoints Allison Henderson
2021-07-28 13:42 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 06/16] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-07-29 7:56 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 07/16] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-07-29 8:27 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 08/16] xfs: Set up infrastructure for deferred attribute operations Allison Henderson
2021-07-28 0:56 ` Darrick J. Wong
2021-07-28 9:04 ` Allison Henderson
2021-07-30 4:46 ` Chandan Babu R
2021-07-30 9:17 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 09/16] xfs: Implement attr logging and replay Allison Henderson
2021-07-27 9:38 ` Chandan Babu R
2021-07-28 9:01 ` Allison Henderson
2021-07-28 0:39 ` Darrick J. Wong
2021-07-28 9:05 ` Allison Henderson
2021-07-30 12:21 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 10/16] RFC xfs: Skip flip flags for delayed attrs Allison Henderson
2021-07-28 19:18 ` Darrick J. Wong
2021-07-31 5:11 ` Allison Henderson
2021-08-02 7:47 ` Allison Henderson
2021-07-30 14:40 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 11/16] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-07-28 19:24 ` Darrick J. Wong
2021-08-02 8:18 ` Allison Henderson
2021-07-30 14:58 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 12/16] xfs: Remove unused xfs_attr_*_args Allison Henderson
2021-07-28 19:31 ` Darrick J. Wong
2021-08-02 8:11 ` Allison Henderson
2021-08-02 3:26 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 13/16] xfs: Add delayed attributes error tag Allison Henderson
2021-08-02 3:27 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 14/16] xfs: Add delattr mount option Allison Henderson
2021-07-28 0:47 ` Darrick J. Wong
2021-07-28 2:13 ` Dave Chinner
2021-07-28 9:05 ` Allison Henderson
2021-07-28 9:02 ` Allison Henderson
2021-07-27 6:20 ` [PATCH v22 15/16] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-08-02 3:27 ` Chandan Babu R
2021-08-02 8:33 ` Allison Henderson
2021-07-27 6:20 ` Allison Henderson [this message]
2021-07-28 19:52 ` [PATCH v22 16/16] xfs: Add helper function xfs_attr_leaf_addname Darrick J. Wong
2021-08-02 8:18 ` 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=20210727062053.11129-17-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).