xfs: move xfs_attr_defer_add to xfs_attr_item.c

Source kernel commit: 9713dc88773d066413ae23aa474b13241507a89e

Move the code that adds the incore xfs_attr_item deferred work data to a
transaction live with the ATTRI log item code.  This means that the
upper level extended attribute code no longer has to know about the
inner workings of the ATTRI log items.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/libxfs/defer_item.c b/libxfs/defer_item.c
index fd329e77cd05374e3d993a47a16f1080990769f2..9955e189dfe12e57c547c90f78426175e4fbf1a3 100644 (file)
--- a/libxfs/defer_item.c
+++ b/libxfs/defer_item.c
@@ -670,6 +670,34 @@ xfs_attr_cancel_item(
        xfs_attr_free_item(attr);
 }
 
+void
+xfs_attr_defer_add(
+       struct xfs_da_args      *args,
+       enum xfs_attr_defer_op  op)
+{
+       struct xfs_attr_intent  *new;
+
+       new = kmem_cache_zalloc(xfs_attr_intent_cache, GFP_NOFS | __GFP_NOFAIL);
+       new->xattri_da_args = args;
+
+       switch (op) {
+       case XFS_ATTR_DEFER_SET:
+               new->xattri_op_flags = XFS_ATTRI_OP_FLAGS_SET;
+               new->xattri_dela_state = xfs_attr_init_add_state(args);
+               break;
+       case XFS_ATTR_DEFER_REPLACE:
+               new->xattri_op_flags = XFS_ATTRI_OP_FLAGS_REPLACE;
+               new->xattri_dela_state = xfs_attr_init_replace_state(args);
+               break;
+       case XFS_ATTR_DEFER_REMOVE:
+               new->xattri_op_flags = XFS_ATTRI_OP_FLAGS_REMOVE;
+               new->xattri_dela_state = xfs_attr_init_remove_state(args);
+               break;
+       }
+
+       xfs_defer_add(args->trans, &new->xattri_list, &xfs_attr_defer_type);
+}
+
 const struct xfs_defer_op_type xfs_attr_defer_type = {
        .name           = "attr",
        .max_items      = 1,

diff --git a/libxfs/defer_item.h b/libxfs/defer_item.h
index a5a07867cc231d5d181f914a1495dcc7180344f0..df2b8d68ba9c5d3e04e807ef2427359c7411a789 100644 (file)
--- a/libxfs/defer_item.h
+++ b/libxfs/defer_item.h
@@ -10,6 +10,14 @@ struct xfs_bmap_intent;
 
 void xfs_bmap_defer_add(struct xfs_trans *tp, struct xfs_bmap_intent *bi);
 
+enum xfs_attr_defer_op {
+       XFS_ATTR_DEFER_SET,
+       XFS_ATTR_DEFER_REMOVE,
+       XFS_ATTR_DEFER_REPLACE,
+};
+
+void xfs_attr_defer_add(struct xfs_da_args *args, enum xfs_attr_defer_op op);
+
 struct xfs_exchmaps_intent;
 
 void xfs_exchmaps_defer_add(struct xfs_trans *tp,

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index e0a3bc7028bc41de65c5f677c53753d54d271e71..7f64d8a2ed9e2c4926ad5cddac9f3e755df41dba 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -24,6 +24,7 @@
 #include "xfs_quota_defs.h"
 #include "xfs_trans_space.h"
 #include "xfs_trace.h"
+#include "defer_item.h"
 
 struct kmem_cache              *xfs_attr_intent_cache;
 
@@ -899,37 +900,6 @@ xfs_attr_lookup(
        return error;
 }
 
-static void
-xfs_attr_defer_add(
-       struct xfs_da_args      *args,
-       unsigned int            op_flags)
-{
-
-       struct xfs_attr_intent  *new;
-
-       new = kmem_cache_zalloc(xfs_attr_intent_cache,
-                       GFP_KERNEL | __GFP_NOFAIL);
-       new->xattri_op_flags = op_flags;
-       new->xattri_da_args = args;
-
-       switch (op_flags) {
-       case XFS_ATTRI_OP_FLAGS_SET:
-               new->xattri_dela_state = xfs_attr_init_add_state(args);
-               break;
-       case XFS_ATTRI_OP_FLAGS_REPLACE:
-               new->xattri_dela_state = xfs_attr_init_replace_state(args);
-               break;
-       case XFS_ATTRI_OP_FLAGS_REMOVE:
-               new->xattri_dela_state = xfs_attr_init_remove_state(args);
-               break;
-       default:
-               ASSERT(0);
-       }
-
-       xfs_defer_add(args->trans, &new->xattri_list, &xfs_attr_defer_type);
-       trace_xfs_attr_defer_add(new->xattri_dela_state, args->dp);
-}
-
 int
 xfs_attr_set(
        struct xfs_da_args      *args,
@@ -1019,14 +989,14 @@ xfs_attr_set(
        case -EEXIST:
                if (op == XFS_ATTRUPDATE_REMOVE) {
                        /* if no value, we are performing a remove operation */
-                       xfs_attr_defer_add(args, XFS_ATTRI_OP_FLAGS_REMOVE);
+                       xfs_attr_defer_add(args, XFS_ATTR_DEFER_REMOVE);
                        break;
                }
 
                /* Pure create fails if the attr already exists */
                if (op == XFS_ATTRUPDATE_CREATE)
                        goto out_trans_cancel;
-               xfs_attr_defer_add(args, XFS_ATTRI_OP_FLAGS_REPLACE);
+               xfs_attr_defer_add(args, XFS_ATTR_DEFER_REPLACE);
                break;
        case -ENOATTR:
                /* Can't remove what isn't there. */
@@ -1036,7 +1006,7 @@ xfs_attr_set(
                /* Pure replace fails if no existing attr to replace. */
                if (op == XFS_ATTRUPDATE_REPLACE)
                        goto out_trans_cancel;
-               xfs_attr_defer_add(args, XFS_ATTRI_OP_FLAGS_SET);
+               xfs_attr_defer_add(args, XFS_ATTR_DEFER_SET);
                break;
        default:
                goto out_trans_cancel;