xfs: drop dop param from xfs_defer_op_type ->finish_item() callback

The dfops infrastructure ->finish_item() callback passes the
transaction and dfops as separate parameters. Since dfops is always
part of a transaction, the latter parameter is no longer necessary.
Remove it from the various callbacks.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index 5cd490dc891a06ea8081decfe5ee8f73e18d88b9..d20f541b70612d03370fadead5873aa660563b72 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -6045,7 +6045,6 @@ xfs_bmap_unmap_extent(
 int
 xfs_bmap_finish_one(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dfops,
        struct xfs_inode                *ip,
        enum xfs_bmap_intent_type       type,
        int                             whichfork,
@@ -6072,7 +6071,6 @@ xfs_bmap_finish_one(
 
        switch (type) {
        case XFS_BMAP_MAP:
-               ASSERT(dfops == tp->t_dfops);
                error = xfs_bmapi_remap(tp, ip, startoff, *blockcount,
                                startblock, 0);
                *blockcount = 0;

diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h
index 2e8555c1229aa63d202ef404a53997f00c19807d..9165a878edcdab0f5c76b8dc9b4ca2d88b5d3c8a 100644 (file)
--- a/fs/xfs/libxfs/xfs_bmap.h
+++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -252,9 +252,9 @@ struct xfs_bmap_intent {
        struct xfs_bmbt_irec                    bi_bmap;
 };
 
-int    xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_defer_ops *dfops,
-               struct xfs_inode *ip, enum xfs_bmap_intent_type type,
-               int whichfork, xfs_fileoff_t startoff, xfs_fsblock_t startblock,
+int    xfs_bmap_finish_one(struct xfs_trans *tp, struct xfs_inode *ip,
+               enum xfs_bmap_intent_type type, int whichfork,
+               xfs_fileoff_t startoff, xfs_fsblock_t startblock,
                xfs_filblks_t *blockcount, xfs_exntst_t state);
 int    xfs_bmap_map_extent(struct xfs_mount *mp, struct xfs_defer_ops *dfops,
                struct xfs_inode *ip, struct xfs_bmbt_irec *imap);

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index 1e7073252a5e4805e077345886d8a393fce934eb..66ef9341813b19477192903ce1c4ce449e384152 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -371,7 +371,7 @@ xfs_defer_finish_noroll(
                list_for_each_safe(li, n, &dfp->dfp_work) {
                        list_del(li);
                        dfp->dfp_count--;
-                       error = dfp->dfp_type->finish_item(*tp, dop, li,
+                       error = dfp->dfp_type->finish_item(*tp, li,
                                        dfp->dfp_done, &state);
                        if (error == -EAGAIN) {
                                /*

diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index bf1e9f78561e0741d00f266959b202006bb4a745..0de7504e56517e793c9048522f1b7e1ef1e5b927 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -50,8 +50,8 @@ struct xfs_defer_op_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 xfs_defer_ops *,
-                       struct list_head *, void *, void **);
+       int (*finish_item)(struct xfs_trans *, struct list_head *, void *,
+                       void **);
        void (*finish_cleanup)(struct xfs_trans *, void *, int);
        void (*cancel_item)(struct list_head *);
        int (*diff_items)(void *, struct list_head *, struct list_head *);

diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 4cbc2efb099e158f38e518624bcba5d554639b90..86f297ca90cd2ab323aad75020e676dfaa3f6497 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1082,7 +1082,6 @@ xfs_refcount_finish_one_cleanup(
 int
 xfs_refcount_finish_one(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dfops,
        enum xfs_refcount_intent_type   type,
        xfs_fsblock_t                   startblock,
        xfs_extlen_t                    blockcount,
@@ -1091,6 +1090,7 @@ xfs_refcount_finish_one(
        struct xfs_btree_cur            **pcur)
 {
        struct xfs_mount                *mp = tp->t_mountp;
+       struct xfs_defer_ops            *dfops = tp->t_dfops;
        struct xfs_btree_cur            *rcur;
        struct xfs_buf                  *agbp = NULL;
        int                             error = 0;

diff --git a/fs/xfs/libxfs/xfs_refcount.h b/fs/xfs/libxfs/xfs_refcount.h
index 5fef74412727abef7c9337ddf2c3fa3fc9cfe1d4..3b72c6dbf6ad00862995c9085eb155b286e99fa0 100644 (file)
--- a/fs/xfs/libxfs/xfs_refcount.h
+++ b/fs/xfs/libxfs/xfs_refcount.h
@@ -37,10 +37,9 @@ extern int xfs_refcount_decrease_extent(struct xfs_mount *mp,
 extern void xfs_refcount_finish_one_cleanup(struct xfs_trans *tp,
                struct xfs_btree_cur *rcur, int error);
 extern int xfs_refcount_finish_one(struct xfs_trans *tp,
-               struct xfs_defer_ops *dfops, enum xfs_refcount_intent_type type,
-               xfs_fsblock_t startblock, xfs_extlen_t blockcount,
-               xfs_fsblock_t *new_fsb, xfs_extlen_t *new_len,
-               struct xfs_btree_cur **pcur);
+               enum xfs_refcount_intent_type type, xfs_fsblock_t startblock,
+               xfs_extlen_t blockcount, xfs_fsblock_t *new_fsb,
+               xfs_extlen_t *new_len, struct xfs_btree_cur **pcur);
 
 extern int xfs_refcount_find_shared(struct xfs_btree_cur *cur,
                xfs_agblock_t agbno, xfs_extlen_t aglen, xfs_agblock_t *fbno,

diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c
index b8a6be036cd728f504aff14e052feab08e831039..e828e0b518144d04881ae25ede444497c9c2ea96 100644 (file)
--- a/fs/xfs/xfs_bmap_item.c
+++ b/fs/xfs/xfs_bmap_item.c
@@ -475,9 +475,8 @@ xfs_bui_recover(
        xfs_trans_ijoin(tp, ip, 0);
 
        count = bmap->me_len;
-       error = xfs_trans_log_finish_bmap_update(tp, budp, tp->t_dfops, type,
-                       ip, whichfork, bmap->me_startoff,
-                       bmap->me_startblock, &count, state);
+       error = xfs_trans_log_finish_bmap_update(tp, budp, type, ip, whichfork,
+                       bmap->me_startoff, bmap->me_startblock, &count, state);
        if (error)
                goto err_inode;
 

diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c
index 4a417daae781ab9e99645d06396c55a708383048..43c4ac374cba7afd9ca998944b13d7eec7ca3b8b 100644 (file)
--- a/fs/xfs/xfs_refcount_item.c
+++ b/fs/xfs/xfs_refcount_item.c
@@ -479,8 +479,8 @@ xfs_cui_recover(
                        new_len = refc->pe_len;
                } else
                        error = xfs_trans_log_finish_refcount_update(tp, cudp,
-                               tp->t_dfops, type, refc->pe_startblock,
-                               refc->pe_len, &new_fsb, &new_len, &rcur);
+                               type, refc->pe_startblock, refc->pe_len,
+                               &new_fsb, &new_len, &rcur);
                if (error)
                        goto abort_error;
 

diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h
index 8665d45b82c660eb3e65a3b2216eaa9ffc23c73f..299656dbf32484c369e559000c67d1eafe2fb9f4 100644 (file)
--- a/fs/xfs/xfs_trans.h
+++ b/fs/xfs/xfs_trans.h
@@ -268,7 +268,7 @@ void xfs_refcount_update_init_defer_op(void);
 struct xfs_cud_log_item *xfs_trans_get_cud(struct xfs_trans *tp,
                struct xfs_cui_log_item *cuip);
 int xfs_trans_log_finish_refcount_update(struct xfs_trans *tp,
-               struct xfs_cud_log_item *cudp, struct xfs_defer_ops *dfops,
+               struct xfs_cud_log_item *cudp,
                enum xfs_refcount_intent_type type, xfs_fsblock_t startblock,
                xfs_extlen_t blockcount, xfs_fsblock_t *new_fsb,
                xfs_extlen_t *new_len, struct xfs_btree_cur **pcur);
@@ -280,9 +280,9 @@ void xfs_bmap_update_init_defer_op(void);
 struct xfs_bud_log_item *xfs_trans_get_bud(struct xfs_trans *tp,
                struct xfs_bui_log_item *buip);
 int xfs_trans_log_finish_bmap_update(struct xfs_trans *tp,
-               struct xfs_bud_log_item *rudp, struct xfs_defer_ops *dfops,
-               enum xfs_bmap_intent_type type, struct xfs_inode *ip,
-               int whichfork, xfs_fileoff_t startoff, xfs_fsblock_t startblock,
-               xfs_filblks_t *blockcount, xfs_exntst_t state);
+               struct xfs_bud_log_item *rudp, enum xfs_bmap_intent_type type,
+               struct xfs_inode *ip, int whichfork, xfs_fileoff_t startoff,
+               xfs_fsblock_t startblock, xfs_filblks_t *blockcount,
+               xfs_exntst_t state);
 
 #endif /* __XFS_TRANS_H__ */

diff --git a/fs/xfs/xfs_trans_bmap.c b/fs/xfs/xfs_trans_bmap.c
index a15a5cd867f9b943ead844efb8da4095e6527f51..741c558b2179849e4785ebd1c9ce0b562f8d866b 100644 (file)
--- a/fs/xfs/xfs_trans_bmap.c
+++ b/fs/xfs/xfs_trans_bmap.c
@@ -43,7 +43,6 @@ int
 xfs_trans_log_finish_bmap_update(
        struct xfs_trans                *tp,
        struct xfs_bud_log_item         *budp,
-       struct xfs_defer_ops            *dop,
        enum xfs_bmap_intent_type       type,
        struct xfs_inode                *ip,
        int                             whichfork,
@@ -54,7 +53,7 @@ xfs_trans_log_finish_bmap_update(
 {
        int                             error;
 
-       error = xfs_bmap_finish_one(tp, dop, ip, type, whichfork, startoff,
+       error = xfs_bmap_finish_one(tp, ip, type, whichfork, startoff,
                        startblock, blockcount, state);
 
        /*
@@ -176,7 +175,6 @@ xfs_bmap_update_create_done(
 STATIC int
 xfs_bmap_update_finish_item(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        struct list_head                *item,
        void                            *done_item,
        void                            **state)
@@ -187,7 +185,7 @@ xfs_bmap_update_finish_item(
 
        bmap = container_of(item, struct xfs_bmap_intent, bi_list);
        count = bmap->bi_bmap.br_blockcount;
-       error = xfs_trans_log_finish_bmap_update(tp, done_item, dop,
+       error = xfs_trans_log_finish_bmap_update(tp, done_item,
                        bmap->bi_type,
                        bmap->bi_owner, bmap->bi_whichfork,
                        bmap->bi_bmap.br_startoff,

diff --git a/fs/xfs/xfs_trans_extfree.c b/fs/xfs/xfs_trans_extfree.c
index bd66c76f55e6dc0f453471d591f0b26a94d0e6c5..855c0b651fd40a3db5ad78d1740cbfb283fe0281 100644 (file)
--- a/fs/xfs/xfs_trans_extfree.c
+++ b/fs/xfs/xfs_trans_extfree.c
@@ -171,7 +171,6 @@ xfs_extent_free_create_done(
 STATIC int
 xfs_extent_free_finish_item(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        struct list_head                *item,
        void                            *done_item,
        void                            **state)
@@ -226,7 +225,6 @@ static const struct xfs_defer_op_type xfs_extent_free_defer_type = {
 STATIC int
 xfs_agfl_free_finish_item(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        struct list_head                *item,
        void                            *done_item,
        void                            **state)

diff --git a/fs/xfs/xfs_trans_refcount.c b/fs/xfs/xfs_trans_refcount.c
index 46dd4fca8aa772e97cd75f21a6fb2a9932308958..523c55663954bca7a220fe7984e78ac1403b5f53 100644 (file)
--- a/fs/xfs/xfs_trans_refcount.c
+++ b/fs/xfs/xfs_trans_refcount.c
@@ -42,7 +42,6 @@ int
 xfs_trans_log_finish_refcount_update(
        struct xfs_trans                *tp,
        struct xfs_cud_log_item         *cudp,
-       struct xfs_defer_ops            *dop,
        enum xfs_refcount_intent_type   type,
        xfs_fsblock_t                   startblock,
        xfs_extlen_t                    blockcount,
@@ -52,7 +51,7 @@ xfs_trans_log_finish_refcount_update(
 {
        int                             error;
 
-       error = xfs_refcount_finish_one(tp, dop, type, startblock,
+       error = xfs_refcount_finish_one(tp, type, startblock,
                        blockcount, new_fsb, new_len, pcur);
 
        /*
@@ -169,7 +168,6 @@ xfs_refcount_update_create_done(
 STATIC int
 xfs_refcount_update_finish_item(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        struct list_head                *item,
        void                            *done_item,
        void                            **state)
@@ -180,7 +178,7 @@ xfs_refcount_update_finish_item(
        int                             error;
 
        refc = container_of(item, struct xfs_refcount_intent, ri_list);
-       error = xfs_trans_log_finish_refcount_update(tp, done_item, dop,
+       error = xfs_trans_log_finish_refcount_update(tp, done_item,
                        refc->ri_type,
                        refc->ri_startblock,
                        refc->ri_blockcount,

diff --git a/fs/xfs/xfs_trans_rmap.c b/fs/xfs/xfs_trans_rmap.c
index 726d8e2c0558a560165ede020f81539549652aa9..05b00e40251fe8fd41c987d18b90d5b7c07a444c 100644 (file)
--- a/fs/xfs/xfs_trans_rmap.c
+++ b/fs/xfs/xfs_trans_rmap.c
@@ -193,7 +193,6 @@ xfs_rmap_update_create_done(
 STATIC int
 xfs_rmap_update_finish_item(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        struct list_head                *item,
        void                            *done_item,
        void                            **state)