xfs: switch attr remove to xfs_attri_set_iter

Now that xfs_attri_set_iter() has initial states for removing
attributes, switch the pure attribute removal code over to using it.
This requires attrs being removed to always be marked as INCOMPLETE
before we start the removal due to the fact we look up the attr to
remove again in xfs_attr_node_remove_attr().

Note: this drops the fillstate/refillstate optimisations from
the remove path that avoid having to look up the path again after
setting the incomplete flag and removing remote attrs. Restoring
that optimisation to this path is future Dave's problem.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Allison Henderson <allison.henderson@oracle.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c
index cb46dca..83b20d0 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.c
+++ b/fs/xfs/libxfs/xfs_attr.c
@@ -498,13 +498,11 @@ int xfs_attr_node_removename_setup(
        ASSERT((*state)->path.blk[(*state)->path.active - 1].magic ==
                XFS_ATTR_LEAF_MAGIC);
 
-       if (args->rmtblkno > 0) {
-               error = xfs_attr_leaf_mark_incomplete(args, *state);
-               if (error)
-                       goto out;
-
+       error = xfs_attr_leaf_mark_incomplete(args, *state);
+       if (error)
+               goto out;
+       if (args->rmtblkno > 0)
                error = xfs_attr_rmtval_invalidate(args);
-       }
 out:
        if (error)
                xfs_da_state_free(*state);
@@ -820,7 +818,7 @@ xfs_attr_defer_remove(
        if (error)
                return error;
 
-       new->xattri_dela_state = XFS_DAS_UNINIT;
+       new->xattri_dela_state = xfs_attr_init_remove_state(args);
        xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
        trace_xfs_attr_defer_remove(new->xattri_dela_state, args->dp);
 
@@ -1388,16 +1386,15 @@ xfs_attr_node_remove_attr(
 {
        struct xfs_da_args              *args = attr->xattri_da_args;
        struct xfs_da_state             *state = NULL;
-       struct xfs_mount                *mp = args->dp->i_mount;
        int                             retval = 0;
        int                             error = 0;
 
        /*
-        * Re-find the "old" attribute entry after any split ops. The INCOMPLETE
-        * flag means that we will find the "old" attr, not the "new" one.
+        * The attr we are removing has already been marked incomplete, so
+        * we need to set the filter appropriately to re-find the "old"
+        * attribute entry after any split ops.
         */
-       if (!xfs_has_larp(mp))
-               args->attr_filter |= XFS_ATTR_INCOMPLETE;
+       args->attr_filter |= XFS_ATTR_INCOMPLETE;
        state = xfs_da_state_alloc(args);
        state->inleaf = 0;
        error = xfs_da3_node_lookup_int(state, &retval);

diff --git a/fs/xfs/libxfs/xfs_attr.h b/fs/xfs/libxfs/xfs_attr.h
index 988c245..41d70ad 100644 (file)
--- a/fs/xfs/libxfs/xfs_attr.h
+++ b/fs/xfs/libxfs/xfs_attr.h
@@ -602,6 +602,16 @@ xfs_attr_init_add_state(struct xfs_da_args *args)
        return XFS_DAS_NODE_ADD;
 }
 
+static inline enum xfs_delattr_state
+xfs_attr_init_remove_state(struct xfs_da_args *args)
+{
+       if (xfs_attr_is_shortform(args->dp))
+               return XFS_DAS_SF_REMOVE;
+       if (xfs_attr_is_leaf(args->dp))
+               return XFS_DAS_LEAF_REMOVE;
+       return XFS_DAS_NODE_REMOVE;
+}
+
 static inline enum xfs_delattr_state
 xfs_attr_init_replace_state(struct xfs_da_args *args)
 {

diff --git a/fs/xfs/xfs_attr_item.c b/fs/xfs/xfs_attr_item.c
index 1bf8128..19ceb2d 100644 (file)
--- a/fs/xfs/xfs_attr_item.c
+++ b/fs/xfs/xfs_attr_item.c
@@ -303,12 +303,9 @@ xfs_attrd_item_intent(
 STATIC int
 xfs_xattri_finish_update(
        struct xfs_attr_item            *attr,
-       struct xfs_attrd_log_item       *attrdp,
-       uint32_t                        op_flags)
+       struct xfs_attrd_log_item       *attrdp)
 {
        struct xfs_da_args              *args = attr->xattri_da_args;
-       unsigned int                    op = op_flags &
-                                            XFS_ATTR_OP_FLAGS_TYPE_MASK;
        int                             error;
 
        if (XFS_TEST_ERROR(false, args->dp->i_mount, XFS_ERRTAG_LARP)) {
@@ -316,22 +313,9 @@ xfs_xattri_finish_update(
                goto out;
        }
 
-       switch (op) {
-       case XFS_ATTR_OP_FLAGS_SET:
-       case XFS_ATTR_OP_FLAGS_REPLACE:
-               error = xfs_attr_set_iter(attr);
-               if (!error && attr->xattri_dela_state != XFS_DAS_DONE)
-                       error = -EAGAIN;
-               break;
-       case XFS_ATTR_OP_FLAGS_REMOVE:
-               ASSERT(XFS_IFORK_Q(args->dp));
-               error = xfs_attr_remove_iter(attr);
-               break;
-       default:
-               error = -EFSCORRUPTED;
-               break;
-       }
-
+       error = xfs_attr_set_iter(attr);
+       if (!error && attr->xattri_dela_state != XFS_DAS_DONE)
+               error = -EAGAIN;
 out:
        /*
         * Mark the transaction dirty, even on error. This ensures the
@@ -439,8 +423,7 @@ xfs_attr_finish_item(
         */
        attr->xattri_da_args->trans = tp;
 
-       error = xfs_xattri_finish_update(attr, done_item,
-                                        attr->xattri_op_flags);
+       error = xfs_xattri_finish_update(attr, done_item);
        if (error != -EAGAIN)
                kmem_free(attr);
 
@@ -588,7 +571,7 @@ xfs_attri_item_recover(
                attr->xattri_dela_state = xfs_attr_init_add_state(args);
                break;
        case XFS_ATTR_OP_FLAGS_REMOVE:
-               attr->xattri_dela_state = XFS_DAS_UNINIT;
+               attr->xattri_dela_state = xfs_attr_init_remove_state(args);
                break;
        default:
                ASSERT(0);
@@ -607,7 +590,7 @@ xfs_attri_item_recover(
        xfs_ilock(ip, XFS_ILOCK_EXCL);
        xfs_trans_ijoin(tp, ip, 0);
 
-       ret = xfs_xattri_finish_update(attr, done_item, attrp->alfi_op_flags);
+       ret = xfs_xattri_finish_update(attr, done_item);
        if (ret == -EAGAIN) {
                /* There's more work to do, so add it to this transaction */
                xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_ATTR, &attr->xattri_list);