@@ -261,65 +261,6 @@ xfs_attr_set_shortform(
}
/*
- * Checks to see if a delayed attribute transaction should be rolled. If so,
- * also checks for a defer finish. Transaction is finished and rolled as
- * needed, and returns true of false if the delayed operation should continue.
- */
-STATIC int
-xfs_attr_trans_roll(
- struct xfs_delattr_context *dac)
-{
- struct xfs_da_args *args = dac->da_args;
- int error = 0;
-
- if (dac->flags & XFS_DAC_DEFER_FINISH) {
- /*
- * The caller wants us to finish all the deferred ops so that we
- * avoid pinning the log tail with a large number of deferred
- * ops.
- */
- dac->flags &= ~XFS_DAC_DEFER_FINISH;
- error = xfs_defer_finish(&args->trans);
- if (error)
- return error;
- }
-
- return xfs_trans_roll_inode(&args->trans, args->dp);
-}
-
-/*
- * Set the attribute specified in @args.
- */
-int
-xfs_attr_set_args(
- struct xfs_da_args *args)
-{
- struct xfs_buf *leaf_bp = NULL;
- int error = 0;
- struct xfs_delattr_context dac = {
- .da_args = args,
- };
-
- do {
- error = xfs_attr_set_iter(&dac, &leaf_bp);
- if (error != -EAGAIN)
- break;
-
- error = xfs_attr_trans_roll(&dac);
- if (error)
- return error;
-
- if (leaf_bp) {
- xfs_trans_bjoin(args->trans, leaf_bp);
- xfs_trans_bhold(args->trans, leaf_bp);
- }
-
- } while (true);
-
- return error;
-}
-
-/*
* Set the attribute specified in @args.
* This routine is meant to function as a delayed operation, and may return
* -EAGAIN when the transaction needs to be rolled. Calling functions will need
@@ -362,11 +303,7 @@ xfs_attr_set_iter(
* continue. Otherwise, is it converted from shortform to leaf
* and -EAGAIN is returned.
*/
- error = xfs_attr_set_shortform(args, leaf_bp);
- if (error == -EAGAIN)
- dac->flags |= XFS_DAC_DEFER_FINISH;
-
- return error;
+ return xfs_attr_set_shortform(args, leaf_bp);
}
/*
@@ -397,7 +334,6 @@ xfs_attr_set_iter(
* same state (inode locked and joined, transaction
* clean) no matter how we got to this step.
*/
- dac->flags |= XFS_DAC_DEFER_FINISH;
return -EAGAIN;
case 0:
dac->dela_state = XFS_DAS_FOUND_LBLK;
@@ -454,32 +390,6 @@ xfs_has_attr(
/*
* Remove the attribute specified in @args.
- */
-int
-xfs_attr_remove_args(
- struct xfs_da_args *args)
-{
- int error = 0;
- struct xfs_delattr_context dac = {
- .da_args = args,
- };
-
- do {
- error = xfs_attr_remove_iter(&dac);
- if (error != -EAGAIN)
- break;
-
- error = xfs_attr_trans_roll(&dac);
- if (error)
- return error;
-
- } while (true);
-
- 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
@@ -886,7 +796,6 @@ xfs_attr_leaf_addname(
if (error)
return error;
- dac->flags |= XFS_DAC_DEFER_FINISH;
return -EAGAIN;
}
@@ -1183,7 +1092,6 @@ xfs_attr_node_addname(
* Restart routine from the top. No need to set the
* state
*/
- dac->flags |= XFS_DAC_DEFER_FINISH;
return -EAGAIN;
}
@@ -1196,7 +1104,6 @@ xfs_attr_node_addname(
error = xfs_da3_split(state);
if (error)
goto out;
- dac->flags |= XFS_DAC_DEFER_FINISH;
} else {
/*
* Addition succeeded, update Btree hashvals.
@@ -1237,7 +1144,6 @@ das_alloc_node:
if (error)
return error;
- dac->flags |= XFS_DAC_DEFER_FINISH;
dac->dela_state = XFS_DAS_ALLOC_NODE;
return -EAGAIN;
}
@@ -1505,7 +1411,6 @@ xfs_attr_node_remove_step(
if (retval && (state->path.active > 1)) {
error = xfs_da3_join(state);
if (error)
- dac->flags |= XFS_DAC_DEFER_FINISH;
dac->dela_state = XFS_DAS_RM_SHRINK;
return -EAGAIN;
}
@@ -297,11 +297,9 @@ int xfs_inode_hasattr(struct xfs_inode *ip);
int xfs_attr_get_ilocked(struct xfs_da_args *args);
int xfs_attr_get(struct xfs_da_args *args);
int xfs_attr_set(struct xfs_da_args *args);
-int xfs_attr_set_args(struct xfs_da_args *args);
int xfs_attr_set_iter(struct xfs_delattr_context *dac,
struct xfs_buf **leaf_bp);
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_delattr_context *dac);
bool xfs_attr_namecheck(const void *name, size_t length);
void xfs_delattr_context_init(struct xfs_delattr_context *dac,
Remove xfs_attr_set_args, xfs_attr_remove_args, and xfs_attr_trans_roll. These high level loops are now driven by the delayed operations code, and can be removed. Signed-off-by: Allison Henderson <allison.henderson@oracle.com> --- libxfs/xfs_attr.c | 97 +------------------------------------------------------ libxfs/xfs_attr.h | 2 -- 2 files changed, 1 insertion(+), 98 deletions(-)