From: Allison Henderson <allison.henderson@oracle.com>
To: linux-xfs@vger.kernel.org
Subject: [PATCH v16 22/28] xfsprogs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete
Date: Thu, 25 Mar 2021 17:31:25 -0700 [thread overview]
Message-ID: <20210326003131.32642-23-allison.henderson@oracle.com> (raw)
In-Reply-To: <20210326003131.32642-1-allison.henderson@oracle.com>
Source kernel commit: 392a7ea8080e3753aa179d4daaa2ad413d0ff441
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>
---
libxfs/xfs_attr.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 1db60ef..e1d37f9 100644
--- a/libxfs/xfs_attr.c
+++ b/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);
@@ -1074,6 +1075,25 @@ restart:
return error;
}
+ error = xfs_attr_node_addname_clear_incomplete(args);
+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-03-26 0:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 0:31 [PATCH v16 00/28] xfsprogs: Delay Ready Attributes Allison Henderson
2021-03-26 0:31 ` [PATCH v16 01/28] xfsprogs: fix an ABBA deadlock in xfs_rename Allison Henderson
2021-03-26 0:31 ` [PATCH v16 02/28] xfsprogs: Add helper for checking per-inode extent count overflow Allison Henderson
2021-03-26 0:31 ` [PATCH v16 03/28] xfsprogs: Check for extent overflow when trivally adding a new extent Allison Henderson
2021-03-26 0:31 ` [PATCH v16 04/28] xfsprogs: Check for extent overflow when punching a hole Allison Henderson
2021-03-26 0:31 ` [PATCH v16 05/28] xfsprogs: Check for extent overflow when adding dir entries Allison Henderson
2021-03-26 0:31 ` [PATCH v16 06/28] xfsprogs: Check for extent overflow when removing " Allison Henderson
2021-03-26 0:31 ` [PATCH v16 07/28] xfsprogs: Check for extent overflow when renaming " Allison Henderson
2021-03-26 0:31 ` [PATCH v16 08/28] xfsprogs: Check for extent overflow when adding/removing xattrs Allison Henderson
2021-03-26 0:31 ` [PATCH v16 09/28] xfsprogs: Check for extent overflow when writing to unwritten extent Allison Henderson
2021-03-26 0:31 ` [PATCH v16 10/28] xfsprogs: Check for extent overflow when moving extent from cow to data fork Allison Henderson
2021-03-26 0:31 ` [PATCH v16 11/28] xfsprogs: Check for extent overflow when swapping extents Allison Henderson
2021-03-26 0:31 ` [PATCH v16 12/28] xfsprogs: Introduce error injection to reduce maximum inode fork extent count Allison Henderson
2021-03-26 0:31 ` [PATCH v16 13/28] xfsprogs: Remove duplicate assert statement in xfs_bmap_btalloc() Allison Henderson
2021-03-26 0:31 ` [PATCH v16 14/28] xfsprogs: Compute bmap extent alignments in a separate function Allison Henderson
2021-03-26 0:31 ` [PATCH v16 15/28] xfsprogs: Process allocated extent " Allison Henderson
2021-03-26 0:31 ` [PATCH v16 16/28] xfsprogs: Introduce error injection to allocate only minlen size extents for files Allison Henderson
2021-03-26 0:31 ` [PATCH v16 17/28] libxfs: expose inobtcount in xfs geometry Allison Henderson
2021-03-26 0:31 ` [PATCH v16 18/28] xfsprogs: Reverse apply 72b97ea40d Allison Henderson
2021-03-26 0:31 ` [PATCH v16 19/28] xfsprogs: Add xfs_attr_node_remove_cleanup Allison Henderson
2021-03-26 0:31 ` [PATCH v16 20/28] xfsprogs: Hoist xfs_attr_set_shortform Allison Henderson
2021-03-26 0:31 ` [PATCH v16 21/28] xfsprogs: Add helper xfs_attr_set_fmt Allison Henderson
2021-03-26 0:31 ` Allison Henderson [this message]
2021-03-26 0:31 ` [PATCH v16 23/28] xfsprogs: Add helper xfs_attr_node_addname_find_attr Allison Henderson
2021-03-26 0:31 ` [PATCH v16 24/28] xfsprogs: Hoist xfs_attr_node_addname Allison Henderson
2021-03-26 0:31 ` [PATCH v16 25/28] xfsprogs: Hoist xfs_attr_leaf_addname Allison Henderson
2021-03-26 0:31 ` [PATCH v16 26/28] xfsprogs: Hoist node transaction handling Allison Henderson
2021-03-26 0:31 ` [PATCH v16 27/28] xfsprogs: Add delay ready attr remove routines Allison Henderson
2021-03-26 0:31 ` [PATCH v16 28/28] xfsprogs: Add delay ready attr set 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=20210326003131.32642-23-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).