Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83200bfa authored by Brian Foster's avatar Brian Foster Committed by Darrick J. Wong
Browse files

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: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 03f4e4b2

fs/xfs/libxfs/xfs_defer.c

+0 −1
Original line number Diff line number Diff line
@@ -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++)

fs/xfs/libxfs/xfs_defer.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

fs/xfs/xfs_trace.h

+2 −6
Original line number Diff line number Diff line
@@ -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)

)