On 3/29/21 7:42 AM, Chandan Babu R wrote:
On 26 Mar 2021 at 06:03, Allison Henderson wrote:
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@xxxxxxxxxx>
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
---
fs/xfs/libxfs/xfs_attr.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index d46324a..531ff56 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);
@@ -1061,6 +1062,25 @@ xfs_attr_node_addname(
return error;
}
+ error = xfs_attr_node_addname_clear_incomplete(args);
+out:
+ if (state)
+ xfs_da_state_free(state);
+ if (error)
+ return error;
+ return retval;
Lets say the user is performing a xattr rename operation and the call to
xfs_attr3_leaf_add() resulted in returning -ENOSPC. xfs_attr_node_addname()
would later allocate a new leaf and insert the new instance of xattr
name/value into this leaf. However, 'retval' will continue to have -ENOSPC as
its value which is incorrectly returned by the above return statement.
ok, I think we pull out reval in patch 7, but probably a quick retval =
error; assignment at the end of the -ENOSPC scope would be right for
this patch.
Allison
--
chandan
