xfs: clean out superfluous dfops dop params/vars

Source kernel commit: 60f31a609ed3d28791acb2bc24188cb7e2259176

The dfops code still passes around the xfs_defer_ops pointer
superfluously in a few places. Clean this up wherever the
transaction will suffice.

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/trans.c b/libxfs/trans.c
index f476d14f2e88067d0c933a7312520a7af0410ad8..01a531de108214768c7a095a30a13544edae7bf5 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -995,7 +995,7 @@ __xfs_trans_commit(
         * Finish deferred items on final commit. Only permanent transactions
         * should ever have deferred ops.
         */
-       WARN_ON_ONCE(xfs_defer_has_unfinished_work(tp->t_dfops) &&
+       WARN_ON_ONCE(xfs_defer_has_unfinished_work(tp) &&
                     !(tp->t_flags & XFS_TRANS_PERM_LOG_RES));
        if (!regrant && (tp->t_flags & XFS_TRANS_PERM_LOG_RES)) {
                error = xfs_defer_finish_noroll(&tp);

diff --git a/libxfs/xfs_defer.c b/libxfs/xfs_defer.c
index c2f2b9ed4fd2b2f938de40b8e5901eb4d0c15d5b..136f2974d027c847883da733ce329e1d4a0235e4 100644 (file)
--- a/libxfs/xfs_defer.c
+++ b/libxfs/xfs_defer.c
@@ -179,9 +179,9 @@ static const struct xfs_defer_op_type *defer_op_types[XFS_DEFER_OPS_TYPE_MAX];
  */
 STATIC void
 xfs_defer_intake_work(
-       struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop)
+       struct xfs_trans                *tp)
 {
+       struct xfs_defer_ops            *dop = tp->t_dfops;
        struct list_head                *li;
        struct xfs_defer_pending        *dfp;
 
@@ -202,9 +202,9 @@ xfs_defer_intake_work(
 STATIC void
 xfs_defer_trans_abort(
        struct xfs_trans                *tp,
-       struct xfs_defer_ops            *dop,
        int                             error)
 {
+       struct xfs_defer_ops            *dop = tp->t_dfops;
        struct xfs_defer_pending        *dfp;
 
        trace_xfs_defer_trans_abort(tp->t_mountp, dop, _RET_IP_);
@@ -228,7 +228,6 @@ STATIC int
 xfs_defer_trans_roll(
        struct xfs_trans                **tp)
 {
-       struct xfs_defer_ops            *dop = (*tp)->t_dfops;
        struct xfs_buf_log_item         *bli;
        struct xfs_inode_log_item       *ili;
        struct xfs_log_item             *lip;
@@ -270,14 +269,14 @@ xfs_defer_trans_roll(
                }
        }
 
-       trace_xfs_defer_trans_roll((*tp)->t_mountp, dop, _RET_IP_);
+       trace_xfs_defer_trans_roll((*tp)->t_mountp, (*tp)->t_dfops, _RET_IP_);
 
        /* Roll the transaction. */
        error = xfs_trans_roll(tp);
-       dop = (*tp)->t_dfops;
        if (error) {
-               trace_xfs_defer_trans_roll_error((*tp)->t_mountp, dop, error);
-               xfs_defer_trans_abort(*tp, dop, error);
+               trace_xfs_defer_trans_roll_error((*tp)->t_mountp,
+                                                (*tp)->t_dfops, error);
+               xfs_defer_trans_abort(*tp,  error);
                return error;
        }
 
@@ -297,9 +296,10 @@ xfs_defer_trans_roll(
 /* Do we have any work items to finish? */
 bool
 xfs_defer_has_unfinished_work(
-       struct xfs_defer_ops            *dop)
+       struct xfs_trans                *tp)
 {
-       return !list_empty(&dop->dop_pending) || !list_empty(&dop->dop_intake);
+       return !list_empty(&tp->t_dfops->dop_pending) ||
+               !list_empty(&tp->t_dfops->dop_intake);
 }
 
 /*
@@ -309,7 +309,7 @@ static void
 xfs_defer_reset(
        struct xfs_trans        *tp)
 {
-       ASSERT(!xfs_defer_has_unfinished_work(tp->t_dfops));
+       ASSERT(!xfs_defer_has_unfinished_work(tp));
 
        /*
         * Low mode state transfers across transaction rolls to mirror dfops
@@ -330,7 +330,6 @@ int
 xfs_defer_finish_noroll(
        struct xfs_trans                **tp)
 {
-       struct xfs_defer_ops            *dop = (*tp)->t_dfops;
        struct xfs_defer_pending        *dfp;
        struct list_head                *li;
        struct list_head                *n;
@@ -340,24 +339,22 @@ xfs_defer_finish_noroll(
 
        ASSERT((*tp)->t_flags & XFS_TRANS_PERM_LOG_RES);
 
-       trace_xfs_defer_finish((*tp)->t_mountp, dop, _RET_IP_);
+       trace_xfs_defer_finish((*tp)->t_mountp, (*tp)->t_dfops, _RET_IP_);
 
        /* Until we run out of pending work to finish... */
-       while (xfs_defer_has_unfinished_work(dop)) {
+       while (xfs_defer_has_unfinished_work(*tp)) {
                /* Log intents for work items sitting in the intake. */
-               xfs_defer_intake_work(*tp, dop);
+               xfs_defer_intake_work(*tp);
 
                /*
-                * Roll the transaction and update dop in case dfops was
-                * embedded in the transaction.
+                * Roll the transaction.
                 */
                error = xfs_defer_trans_roll(tp);
                if (error)
                        goto out;
-               dop = (*tp)->t_dfops;
 
                /* Log an intent-done item for the first pending item. */
-               dfp = list_first_entry(&dop->dop_pending,
+               dfp = list_first_entry(&(*tp)->t_dfops->dop_pending,
                                struct xfs_defer_pending, dfp_list);
                trace_xfs_defer_pending_finish((*tp)->t_mountp, dfp);
                dfp->dfp_done = dfp->dfp_type->create_done(*tp, dfp->dfp_intent,
@@ -388,7 +385,7 @@ xfs_defer_finish_noroll(
                                 */
                                if (cleanup_fn)
                                        cleanup_fn(*tp, state, error);
-                               xfs_defer_trans_abort(*tp, dop, error);
+                               xfs_defer_trans_abort(*tp, error);
                                goto out;
                        }
                }
@@ -418,9 +415,11 @@ xfs_defer_finish_noroll(
 
 out:
        if (error)
-               trace_xfs_defer_finish_error((*tp)->t_mountp, dop, error);
+               trace_xfs_defer_finish_error((*tp)->t_mountp, (*tp)->t_dfops,
+                                            error);
         else
-               trace_xfs_defer_finish_done((*tp)->t_mountp, dop, _RET_IP_);
+               trace_xfs_defer_finish_done((*tp)->t_mountp, (*tp)->t_dfops,
+                                           _RET_IP_);
 
        return error;
 }

diff --git a/libxfs/xfs_defer.h b/libxfs/xfs_defer.h
index 0de7504e56517e793c9048522f1b7e1ef1e5b927..f051c8056141c1cc3c5592e3fd895885ddec5ada 100644 (file)
--- a/libxfs/xfs_defer.h
+++ b/libxfs/xfs_defer.h
@@ -41,7 +41,7 @@ int xfs_defer_finish_noroll(struct xfs_trans **tp);
 int xfs_defer_finish(struct xfs_trans **tp);
 void xfs_defer_cancel(struct xfs_trans *);
 void xfs_defer_init(struct xfs_trans *tp, struct xfs_defer_ops *dop);
-bool xfs_defer_has_unfinished_work(struct xfs_defer_ops *dop);
+bool xfs_defer_has_unfinished_work(struct xfs_trans *tp);
 void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp);
 
 /* Description of a deferred type. */