xfs: remove unused deferred ops committed field

dop_committed is set when deferred item processing rolls the
transaction at least once, but is only ever accessed in tracepoints.
The transaction roll/commit events are already available via
independent tracepoints, so remove the otherwise unused field.

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

diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
index ee734a8b3fa9ff89cb086bf74e480861b57ab9db..0df09c094e42cf840b7659a43d24f7d18bc81de1 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.c
+++ b/fs/xfs/libxfs/xfs_defer.c
@@ -249,7 +249,6 @@ xfs_defer_trans_roll(
                xfs_defer_trans_abort(*tp, dop, error);
                return error;
        }
-       dop->dop_committed = true;
 
        /* Rejoin the joined inodes. */
        for (i = 0; i < XFS_DEFER_OPS_NR_INODES && dop->dop_inodes[i]; i++)

diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h
index c17c9deda99596b24ef4c49ae081c637637a8095..58c979c9f3fadefbff985afd9f7ff383b038e53f 100644 (file)
--- a/fs/xfs/libxfs/xfs_defer.h
+++ b/fs/xfs/libxfs/xfs_defer.h
@@ -49,7 +49,6 @@ enum xfs_defer_ops_type {
 #define XFS_DEFER_OPS_NR_BUFS  2       /* join up to two buffers */
 
 struct xfs_defer_ops {
-       bool                    dop_committed;  /* did any trans commit? */
        bool                    dop_low;        /* alloc in low mode */
        struct list_head        dop_intake;     /* unlogged pending work */
        struct list_head        dop_pending;    /* logged pending work */

diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
index b668fc127aa7114ec38bfa67b2c0faebb63180b8..cc6995cfce66783deb20ce2ca4a6d64e0b1b65a9 100644 (file)
--- a/fs/xfs/xfs_trace.h
+++ b/fs/xfs/xfs_trace.h
@@ -2229,14 +2229,12 @@ DECLARE_EVENT_CLASS(xfs_defer_class,
        TP_fast_assign(
                __entry->dev = mp ? mp->m_super->s_dev : 0;
                __entry->dop = dop;
-               __entry->committed = dop->dop_committed;
                __entry->low = dop->dop_low;
                __entry->caller_ip = caller_ip;
        ),
-       TP_printk("dev %d:%d ops %p committed %d low %d, caller %pS",
+       TP_printk("dev %d:%d ops %p low %d, caller %pS",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->dop,
-                 __entry->committed,
                  __entry->low,
                  (char *)__entry->caller_ip)
 )
@@ -2259,14 +2257,12 @@ DECLARE_EVENT_CLASS(xfs_defer_error_class,
        TP_fast_assign(
                __entry->dev = mp ? mp->m_super->s_dev : 0;
                __entry->dop = dop;
-               __entry->committed = dop->dop_committed;
                __entry->low = dop->dop_low;
                __entry->error = error;
        ),
-       TP_printk("dev %d:%d ops %p committed %d low %d err %d",
+       TP_printk("dev %d:%d ops %p low %d err %d",
                  MAJOR(__entry->dev), MINOR(__entry->dev),
                  __entry->dop,
-                 __entry->committed,
                  __entry->low,
                  __entry->error)
 )