aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Allison Henderson <allison.henderson@oracle.com> 2021-02-18 01:24:24 -0700
committerGravatar Allison Henderson <allison.henderson@oracle.com> 2021-06-01 10:49:43 -0700
commitf0f7c502c728d0c6947219739631bad101f8737b (patch)
tree51cc88f05c49facf3fefbb0c39a35ee041bb90b1
parentxfs: Refactor xfs_attr_set_shortform (diff)
downloadlinux-f0f7c502c728d0c6947219739631bad101f8737b.tar.gz
linux-f0f7c502c728d0c6947219739631bad101f8737b.tar.bz2
linux-f0f7c502c728d0c6947219739631bad101f8737b.zip
xfs: Separate xfs_attr_node_addname and xfs_attr_node_addname_clear_incomplete
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>
-rw-r--r--fs/xfs/libxfs/xfs_attr.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index 0ec1547a00f8..ad44d779650d 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 @@ restart:
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.