@@ -367,11 +367,60 @@ xfs_has_attr(
*/
int
xfs_attr_remove_args(
+ struct xfs_da_args *args)
+{
+ int error = 0;
+ int err2 = 0;
+
+ do {
+ error = xfs_attr_remove_iter(args);
+ if (error && error != -EAGAIN)
+ goto out;
+
+ if (args->dac.flags & XFS_DAC_FINISH_TRANS) {
+ args->dac.flags &= ~XFS_DAC_FINISH_TRANS;
+
+ err2 = xfs_defer_finish(&args->trans);
+ if (err2) {
+ error = err2;
+ goto out;
+ }
+ }
+
+ err2 = xfs_trans_roll_inode(&args->trans, args->dp);
+ if (err2) {
+ error = err2;
+ goto out;
+ }
+
+ } while (error == -EAGAIN);
+out:
+ return error;
+}
+
+/*
+ * Remove the attribute specified in @args.
+ *
+ * This function may return -EAGAIN to signal that the transaction needs to be
+ * rolled. Callers should continue calling this function until they receive a
+ * return value other than -EAGAIN.
+ */
+int
+xfs_attr_remove_iter(
struct xfs_da_args *args)
{
struct xfs_inode *dp = args->dp;
int error;
+ /* State machine switch */
+ switch (args->dac.dela_state) {
+ case XFS_DAS_RM_SHRINK:
+ case XFS_DAS_RMTVAL_REMOVE:
+ goto node;
+ default:
+ break;
+ }
+
if (!xfs_inode_hasattr(dp)) {
error = -ENOATTR;
} else if (dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL) {
@@ -380,6 +429,7 @@ xfs_attr_remove_args(
} else if (xfs_bmap_one_block(dp, XFS_ATTR_FORK)) {
error = xfs_attr_leaf_removename(args);
} else {
+node:
error = xfs_attr_node_removename(args);
}
@@ -893,9 +943,8 @@ xfs_attr_leaf_removename(
/* bp is gone due to xfs_da_shrink_inode */
if (error)
return error;
- error = xfs_defer_finish(&args->trans);
- if (error)
- return error;
+
+ args->dac.flags |= XFS_DAC_FINISH_TRANS;
}
return 0;
}
@@ -1216,6 +1265,11 @@ out:
* This will involve walking down the Btree, and may involve joining
* leaf nodes and even joining intermediate nodes up to and including
* the root node (a special case of an intermediate node).
+ *
+ * This routine is meant to function as either an inline or delayed operation,
+ * and may return -EAGAIN when the transaction needs to be rolled. Calling
+ * functions will need to handle this, and recall the function until a
+ * successful error code is returned.
*/
STATIC int
xfs_attr_node_removename(
@@ -1228,10 +1282,24 @@ xfs_attr_node_removename(
struct xfs_inode *dp = args->dp;
trace_xfs_attr_node_removename(args);
+ state = args->dac.da_state;
+ blk = args->dac.blk;
+
+ /* State machine switch */
+ switch (args->dac.dela_state) {
+ case XFS_DAS_RMTVAL_REMOVE:
+ goto rm_node_blks;
+ case XFS_DAS_RM_SHRINK:
+ goto rm_shrink;
+ default:
+ break;
+ }
error = xfs_attr_node_hasname(args, &state);
if (error != -EEXIST)
goto out;
+ else
+ error = 0;
/*
* If there is an out-of-line value, de-allocate the blocks.
@@ -1241,6 +1309,14 @@ xfs_attr_node_removename(
blk = &state->path.blk[ state->path.active-1 ];
ASSERT(blk->bp != NULL);
ASSERT(blk->magic == XFS_ATTR_LEAF_MAGIC);
+
+ /*
+ * Store blk and state in the context incase we need to cycle out the
+ * transaction
+ */
+ args->dac.blk = blk;
+ args->dac.da_state = state;
+
if (args->rmtblkno > 0) {
/*
* Fill in disk block numbers in the state structure
@@ -1259,13 +1335,21 @@ xfs_attr_node_removename(
if (error)
goto out;
- error = xfs_trans_roll_inode(&args->trans, args->dp);
+ error = xfs_attr_rmtval_invalidate(args);
if (error)
goto out;
+ }
- error = xfs_attr_rmtval_remove(args);
- if (error)
- goto out;
+rm_node_blks:
+
+ if (args->rmtblkno > 0) {
+ error = xfs_attr_rmtval_unmap(args);
+
+ if (error) {
+ if (error == -EAGAIN)
+ args->dac.dela_state = XFS_DAS_RMTVAL_REMOVE;
+ return error;
+ }
/*
* Refill the state structure with buffers, the prior calls
@@ -1291,17 +1375,15 @@ xfs_attr_node_removename(
error = xfs_da3_join(state);
if (error)
goto out;
- error = xfs_defer_finish(&args->trans);
- if (error)
- goto out;
- /*
- * Commit the Btree join operation and start a new trans.
- */
- error = xfs_trans_roll_inode(&args->trans, dp);
- if (error)
- goto out;
+
+ args->dac.flags |= XFS_DAC_FINISH_TRANS;
+ args->dac.dela_state = XFS_DAS_RM_SHRINK;
+ return -EAGAIN;
}
+rm_shrink:
+ args->dac.dela_state = XFS_DAS_RM_SHRINK;
+
/*
* If the result is small enough, push it all into the inode.
*/
@@ -152,6 +152,7 @@ int xfs_attr_set_args(struct xfs_da_args *args);
int xfs_attr_remove(struct xfs_inode *dp, struct xfs_name *name, int flags);
int xfs_has_attr(struct xfs_da_args *args);
int xfs_attr_remove_args(struct xfs_da_args *args);
+int xfs_attr_remove_iter(struct xfs_da_args *args);
int xfs_attr_list(struct xfs_inode *dp, char *buffer, int bufsize,
int flags, struct attrlist_cursor_kern *cursor);
bool xfs_attr_namecheck(const void *name, size_t length);
@@ -43,9 +43,39 @@ enum xfs_dacmp {
};
/*
+ * Enum values for xfs_delattr_context.da_state
+ *
+ * These values are used by delayed attribute operations to keep track of where
+ * they were before they returned -EAGAIN. A return code of -EAGAIN signals the
+ * calling function to roll the transaction, and then recall the subroutine to
+ * finish the operation. The enum is then used by the subroutine to jump back
+ * to where it was and resume executing where it left off.
+ */
+enum xfs_delattr_state {
+ XFS_DAS_RM_SHRINK, /* We are shrinking the tree */
+ XFS_DAS_RMTVAL_REMOVE, /* We are removing remote value blocks */
+};
+
+/*
+ * Defines for xfs_delattr_context.flags
+ */
+#define XFS_DAC_FINISH_TRANS 0x1 /* indicates to finish the transaction */
+
+/*
+ * Context used for keeping track of delayed attribute operations
+ */
+struct xfs_delattr_context {
+ struct xfs_da_state *da_state;
+ struct xfs_da_state_blk *blk;
+ unsigned int flags;
+ enum xfs_delattr_state dela_state;
+};
+
+/*
* Structure to ease passing around component names.
*/
typedef struct xfs_da_args {
+ struct xfs_delattr_context dac; /* context used for delay attr ops */
struct xfs_da_geometry *geo; /* da block geometry */
struct xfs_name name; /* name, length and argument flags*/
uint8_t filetype; /* filetype of inode for directories */
This patch modifies the attr remove routines to be delay ready. This means they no longer roll or commit transactions, but instead return -EAGAIN to have the calling routine roll and refresh the transaction. In this series, xfs_attr_remove_args has become xfs_attr_remove_iter, which uses a sort of state machine like switch to keep track of where it was when EAGAIN was returned. xfs_attr_node_removename has also been modified to use the switch, and a new version of xfs_attr_remove_args consists of a simple loop to refresh the transaction until the operation is completed. This patch also adds a new struct xfs_delattr_context, which we will use to keep track of the current state of an attribute operation. The new xfs_delattr_state enum is used to track various operations that are in progress so that we know not to repeat them, and resume where we left off before EAGAIN was returned to cycle out the transaction. Other members take the place of local variables that need to retain their values across multiple function recalls. Below is a state machine diagram for attr remove operations. The XFS_DAS_* states indicate places where the function would return -EAGAIN, and then immediately resume from after being recalled by the calling function. States marked as a "subroutine state" indicate that they belong to a subroutine, and so the calling function needs to pass them back to that subroutine to allow it to finish where it left off. But they otherwise do not have a role in the calling function other than just passing through. xfs_attr_remove_iter() XFS_DAS_RM_SHRINK ─┐ (subroutine state) │ │ XFS_DAS_RMTVAL_REMOVE ─┤ (subroutine state) │ └─>xfs_attr_node_removename() │ v need to remove ┌─n── rmt blocks? │ │ │ y │ │ │ v │ ┌─>XFS_DAS_RMTVAL_REMOVE │ │ │ │ │ v │ └──y── more blks │ to remove? │ │ │ n │ │ │ v │ need to └─────> shrink tree? ─n─┐ │ │ y │ │ │ v │ XFS_DAS_RM_SHRINK │ │ │ v │ done <─────┘ Signed-off-by: Allison Collins <allison.henderson@oracle.com> --- libxfs/xfs_attr.c | 114 +++++++++++++++++++++++++++++++++++++++++++------- libxfs/xfs_attr.h | 1 + libxfs/xfs_da_btree.h | 30 +++++++++++++ 3 files changed, 129 insertions(+), 16 deletions(-)