On 4/8/20 5:09 AM, Brian Foster wrote:
On Fri, Apr 03, 2020 at 03:12:25PM -0700, Allison Collins wrote:
This patch adds a new helper function xfs_attr_node_removename_setup.
This will help modularize xfs_attr_node_removename when we add delay
ready attributes later.
Signed-off-by: Allison Collins <allison.henderson@xxxxxxxxxx>
---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
Ok, thank you!
Allison
fs/xfs/libxfs/xfs_attr.c | 40 +++++++++++++++++++++++++++++++---------
1 file changed, 31 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index f70b4f2..3c33dc5 100644
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -1193,6 +1193,35 @@ xfs_attr_leaf_mark_incomplete(
}
/*
+ * Initial setup for xfs_attr_node_removename. Make sure the attr is there and
+ * the blocks are valid. Any remote blocks will be marked incomplete.
+ */
+STATIC
+int xfs_attr_node_removename_setup(
+ struct xfs_da_args *args,
+ struct xfs_da_state **state)
+{
+ int error;
+ struct xfs_da_state_blk *blk;
+
+ error = xfs_attr_node_hasname(args, state);
+ if (error != -EEXIST)
+ return error;
+
+ blk = &(*state)->path.blk[(*state)->path.active - 1];
+ ASSERT(blk->bp != NULL);
+ ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
+
+ if (args->rmtblkno > 0) {
+ error = xfs_attr_leaf_mark_incomplete(args, *state);
+ if (error)
+ return error;
+ }
+
+ return 0;
+}
+
+/*
* Remove a name from a B-tree attribute list.
*
* This will involve walking down the Btree, and may involve joining
@@ -1210,8 +1239,8 @@ xfs_attr_node_removename(
trace_xfs_attr_node_removename(args);
- error = xfs_attr_node_hasname(args, &state);
- if (error != -EEXIST)
+ error = xfs_attr_node_removename_setup(args, &state);
+ if (error)
goto out;
/*
@@ -1219,14 +1248,7 @@ xfs_attr_node_removename(
* This is done before we remove the attribute so that we don't
* overflow the maximum size of a transaction and/or hit a deadlock.
*/
- blk = &state->path.blk[ state->path.active-1 ];
- ASSERT(blk->bp != NULL);
- ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
if (args->rmtblkno > 0) {
- error = xfs_attr_leaf_mark_incomplete(args, state);
- if (error)
- goto out;
-
error = xfs_attr_rmtval_remove(args);
if (error)
goto out;
--
2.7.4
