xfs: streamline defer op type handling

There's no need to bundle a pointer to the defer op type into the defer
op control structure.  Instead, store the defer op type enum, which
enables us to shorten some of the lines.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>

1 files changed, 15 insertions, 16 deletions

diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index 0a4b88e3df74..7c28d7608ac6 100644
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -9,20 +9,6 @@
 struct xfs_defer_op_type;
 
 /*
- * Save a log intent item and a list of extents, so that we can replay
- * whatever action had to happen to the extent list and file the log done
- * item.
- */
-struct xfs_defer_pending {
-        const struct xfs_defer_op_type  *dfp_type;      /* function pointers */
-        struct list_head                dfp_list;       /* pending items */
-        void                            *dfp_intent;    /* log intent item */
-        void                            *dfp_done;      /* log done item */
-        struct list_head                dfp_work;       /* work items */
-        unsigned int                    dfp_count;      /* # extent items */
-};
-
-/*
  * Header for deferred operation list.
  */
 enum xfs_defer_ops_type {
@@ -34,6 +20,20 @@ enum xfs_defer_ops_type {
         XFS_DEFER_OPS_TYPE_MAX,
 };
 
+/*
+ * Save a log intent item and a list of extents, so that we can replay
+ * whatever action had to happen to the extent list and file the log done
+ * item.
+ */
+struct xfs_defer_pending {
+        struct list_head                dfp_list;       /* pending items */
+        struct list_head                dfp_work;       /* work items */
+        void                            *dfp_intent;    /* log intent item */
+        void                            *dfp_done;      /* log done item */
+        unsigned int                    dfp_count;      /* # extent items */
+        enum xfs_defer_ops_type         dfp_type;
+};
+
 void xfs_defer_add(struct xfs_trans *tp, enum xfs_defer_ops_type type,
                 struct list_head *h);
 int xfs_defer_finish_noroll(struct xfs_trans **tp);
@@ -43,8 +43,6 @@ void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp);
 
 /* Description of a deferred type. */
 struct xfs_defer_op_type {
-        enum xfs_defer_ops_type type;
-        unsigned int            max_items;
         void (*abort_intent)(void *);
         void *(*create_done)(struct xfs_trans *, void *, unsigned int);
         int (*finish_item)(struct xfs_trans *, struct list_head *, void *,
@@ -54,6 +52,7 @@ struct xfs_defer_op_type {
         int (*diff_items)(void *, struct list_head *, struct list_head *);
         void *(*create_intent)(struct xfs_trans *, uint);
         void (*log_item)(struct xfs_trans *, void *, struct list_head *);
+        unsigned int            max_items;
 };
 
 extern const struct xfs_defer_op_type xfs_bmap_update_defer_type;