From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v20 04/14] xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete
Date: Fri, 4 Jun 2021 16:41:56 -0700 [thread overview]
Message-ID: <20210604234206.31683-5-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210604234206.31683-1-allison.henderson@oracle.com>
This patch separate xfs_attr_node_addname into two functions. This will
help to make it easier to hoist parts of xfs_attr_node_addname that need
state management
Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
---
fs/xfs/libxfs/xfs_attr.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 0ec1547..ad44d77 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -54,6 +54,7 @@ STATIC int xfs_attr_leaf_hasname(struct xfs_da_args *args, struct xfs_buf **bp);
STATIC int xfs_attr_node_get(xfs_da_args_t *args);
STATIC int xfs_attr_node_addname(xfs_da_args_t *args);
STATIC int xfs_attr_node_removename(xfs_da_args_t *args);
+STATIC int xfs_attr_node_addname_clear_incomplete(struct xfs_da_args *args);
STATIC int xfs_attr_node_hasname(xfs_da_args_t *args,
struct xfs_da_state **state);
STATIC int xfs_attr_fillstate(xfs_da_state_t *state);
@@ -1073,6 +1074,28 @@ xfs_attr_node_addname(
return error;
}
+ error = xfs_attr_node_addname_clear_incomplete(args);
+ if (error)
+ goto out;
+ retval = 0;
+out:
+ if (state)
+ xfs_da_state_free(state);
+ if (error)
+ return error;
+ return retval;
+}
+
+
+STATIC int
+xfs_attr_node_addname_clear_incomplete(
+ struct xfs_da_args *args)
+{
+ struct xfs_da_state *state = NULL;
+ struct xfs_da_state_blk *blk;
+ int retval = 0;
+ int error = 0;
+
/*
* 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.
--
2.7.4
next prev parent reply other threads:[~2021-06-04 23:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-04 23:41 [PATCH v20 00/14] Delay Ready Attributes Allison Henderson
2021-06-04 23:41 ` [PATCH v20 01/14] xfs: Reverse apply 72b97ea40d Allison Henderson
2021-06-04 23:41 ` [PATCH v20 02/14] xfs: Add xfs_attr_node_remove_name Allison Henderson
2021-06-04 23:41 ` [PATCH v20 03/14] xfs: Refactor xfs_attr_set_shortform Allison Henderson
2021-06-04 23:41 ` Allison Henderson [this message]
2021-06-04 23:41 ` [PATCH v20 05/14] xfs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-06-04 23:41 ` [PATCH v20 06/14] xfs: Hoist xfs_attr_node_addname Allison Henderson
2021-06-04 23:41 ` [PATCH v20 07/14] xfs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-06-04 23:42 ` [PATCH v20 08/14] xfs: Hoist node transaction handling Allison Henderson
2021-06-04 23:42 ` [PATCH v20 09/14] xfs: Add delay ready attr remove routines 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=20210604234206.31683-5-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.