@@ -1185,6 +1185,39 @@ 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;
+
+ error = xfs_attr_rmtval_invalidate(args);
+ 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
@@ -1202,8 +1235,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;
/*
@@ -1211,18 +1244,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_invalidate(args);
- if (error)
- return error;
-
error = xfs_attr_rmtval_remove(args);
if (error)
goto out;