xfs: pass the defer ops directly to xfs_defer_add

Source kernel commit: 603ce8ab12094a2d9483c79a7541335e258a5328

Pass a pointer to the xfs_defer_op_type structure to xfs_defer_add and
remove the indirection through the xfs_defer_ops_type enum and a global
table of all possible operations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
Reviewed-by: Bill O'Donnell <bodonnel@redhat.com>

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 463381be7863729c31ad8e9e1a6df6187d1daf15..aaa1596157e9ad23af325fb2f15e8591f85acaec 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -2510,7 +2510,7 @@ xfs_defer_agfl_block(
        trace_xfs_agfl_free_defer(mp, agno, 0, agbno, 1);
 
        xfs_extent_free_get_group(mp, xefi);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_AGFL_FREE, &xefi->xefi_list);
+       xfs_defer_add(tp, &xefi->xefi_list, &xfs_agfl_free_defer_type);
        return 0;
 }
 
@@ -2574,7 +2574,7 @@ xfs_defer_extent_free(
                        XFS_FSB_TO_AGBNO(tp->t_mountp, bno), len);
 
        xfs_extent_free_get_group(mp, xefi);
-       *dfpp = xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_FREE, &xefi->xefi_list);
+       *dfpp = xfs_defer_add(tp, &xefi->xefi_list, &xfs_extent_free_defer_type);
        return 0;
 }
 

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 550ca6b2e263fb22fa86eed45ff2782e25b4beba..cb6c8d081fd3d1b5d7dc1caddcaf8539f14b07b0 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -904,7 +904,7 @@ xfs_attr_defer_add(
                ASSERT(0);
        }
 
-       xfs_defer_add(args->trans, XFS_DEFER_OPS_TYPE_ATTR, &new->xattri_list);
+       xfs_defer_add(args->trans, &new->xattri_list, &xfs_attr_defer_type);
        trace_xfs_attr_defer_add(new->xattri_dela_state, args->dp);
 }
 

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 20ec22dfcaf4ee1299b0bdcc1cb246e6e653a39c..6d23c5e3e652b7a0e640ee04f2f7c447ac6dd772 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -6085,7 +6085,7 @@ __xfs_bmap_add(
        bi->bi_bmap = *bmap;
 
        xfs_bmap_update_get_group(tp->t_mountp, bi);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_BMAP, &bi->bi_list);
+       xfs_defer_add(tp, &bi->bi_list, &xfs_bmap_update_defer_type);
        return 0;
 }
 

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index 033283017faec86d8f5fd96535e2476f75cf08ae..077e992980743e08fe2c2e36b96b80ac850e1e96 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -229,16 +229,6 @@ static const struct xfs_defer_op_type xfs_barrier_defer_type = {
        .cancel_item    = xfs_defer_barrier_cancel_item,
 };
 
-static const struct xfs_defer_op_type *defer_op_types[] = {
-       [XFS_DEFER_OPS_TYPE_BMAP]       = &xfs_bmap_update_defer_type,
-       [XFS_DEFER_OPS_TYPE_REFCOUNT]   = &xfs_refcount_update_defer_type,
-       [XFS_DEFER_OPS_TYPE_RMAP]       = &xfs_rmap_update_defer_type,
-       [XFS_DEFER_OPS_TYPE_FREE]       = &xfs_extent_free_defer_type,
-       [XFS_DEFER_OPS_TYPE_AGFL_FREE]  = &xfs_agfl_free_defer_type,
-       [XFS_DEFER_OPS_TYPE_ATTR]       = &xfs_attr_defer_type,
-       [XFS_DEFER_OPS_TYPE_BARRIER]    = &xfs_barrier_defer_type,
-};
-
 /* Create a log intent done item for a log intent item. */
 static inline void
 xfs_defer_create_done(
@@ -841,14 +831,12 @@ xfs_defer_alloc(
 struct xfs_defer_pending *
 xfs_defer_add(
        struct xfs_trans                *tp,
-       enum xfs_defer_ops_type         type,
-       struct list_head                *li)
+       struct list_head                *li,
+       const struct xfs_defer_op_type  *ops)
 {
        struct xfs_defer_pending        *dfp = NULL;
-       const struct xfs_defer_op_type  *ops = defer_op_types[type];
 
        ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES);
-       BUILD_BUG_ON(ARRAY_SIZE(defer_op_types) != XFS_DEFER_OPS_TYPE_MAX);
 
        dfp = xfs_defer_find_last(tp, ops);
        if (!dfp || !xfs_defer_can_append(dfp, ops))

diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h
index 60de91b66392256b4a79702777a0df6e2abbf63e..18a9fb92dde8e6d990761bfc42da96b6d4a3f0cd 100644 (file)
--- a/libxfs/xfs_defer.h
+++ b/libxfs/xfs_defer.h
@@ -10,20 +10,6 @@ struct xfs_btree_cur;
 struct xfs_defer_op_type;
 struct xfs_defer_capture;
 
-/*
- * Header for deferred operation list.
- */
-enum xfs_defer_ops_type {
-       XFS_DEFER_OPS_TYPE_BMAP,
-       XFS_DEFER_OPS_TYPE_REFCOUNT,
-       XFS_DEFER_OPS_TYPE_RMAP,
-       XFS_DEFER_OPS_TYPE_FREE,
-       XFS_DEFER_OPS_TYPE_AGFL_FREE,
-       XFS_DEFER_OPS_TYPE_ATTR,
-       XFS_DEFER_OPS_TYPE_BARRIER,
-       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
@@ -51,8 +37,8 @@ struct xfs_defer_pending {
 void xfs_defer_item_pause(struct xfs_trans *tp, struct xfs_defer_pending *dfp);
 void xfs_defer_item_unpause(struct xfs_trans *tp, struct xfs_defer_pending *dfp);
 
-struct xfs_defer_pending *xfs_defer_add(struct xfs_trans *tp,
-               enum xfs_defer_ops_type type, struct list_head *h);
+struct xfs_defer_pending *xfs_defer_add(struct xfs_trans *tp, struct list_head *h,
+               const struct xfs_defer_op_type *ops);
 int xfs_defer_finish_noroll(struct xfs_trans **tp);
 int xfs_defer_finish(struct xfs_trans **tp);
 int xfs_defer_finish_one(struct xfs_trans *tp, struct xfs_defer_pending *dfp);

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index 2284b45fbb044b8bcc9a64611108c4283e543c53..45f8134e4314aa43e47dd1f60c758e14219ac981 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -1457,7 +1457,7 @@ __xfs_refcount_add(
        ri->ri_blockcount = blockcount;
 
        xfs_refcount_update_get_group(tp->t_mountp, ri);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_REFCOUNT, &ri->ri_list);
+       xfs_defer_add(tp, &ri->ri_list, &xfs_refcount_update_defer_type);
 }
 
 /*

diff --git a/libxfs/xfs_rmap.c b/libxfs/xfs_rmap.c
index 5ff6d7a32f2f17988946cdee3f9e266deab9b275..4731e10d2101e7ac2d288981cb48eff112f483f1 100644 (file)
--- a/libxfs/xfs_rmap.c
+++ b/libxfs/xfs_rmap.c
@@ -2566,7 +2566,7 @@ __xfs_rmap_add(
        ri->ri_bmap = *bmap;
 
        xfs_rmap_update_get_group(tp->t_mountp, ri);
-       xfs_defer_add(tp, XFS_DEFER_OPS_TYPE_RMAP, &ri->ri_list);
+       xfs_defer_add(tp, &ri->ri_list, &xfs_rmap_update_defer_type);
 }
 
 /* Map an extent into a file. */