[SRU] [B] [PATCH 1/1] UBUNTU: SAUCE: zfs: fix build error with tracepoints enabled
Andrea Righi
andrea.righi at canonical.com
Wed May 15 10:58:47 UTC 2019
BugLink: https://bugs.launchpad.net/bugs/1828763
In b49151d684f44 tx_waited has been renamed to tx_dirty_delayed, but
only in the tracepoint definition (in trace_dmu.h) and not in the rest
of the code, causing build errors if zfs tracepoints are enabled.
Fix by reverting tx_dirty_delayed back to the original name tx_waited.
NOTE: this bug doesn't show up in regular kernel builds, because zfs
tracepoints are not enabled by default.
Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
---
zfs/include/sys/trace_dmu.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/zfs/include/sys/trace_dmu.h b/zfs/include/sys/trace_dmu.h
index 24e57f5146a4..51304ddc925c 100644
--- a/zfs/include/sys/trace_dmu.h
+++ b/zfs/include/sys/trace_dmu.h
@@ -50,7 +50,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
__field(uint64_t, tx_lastsnap_txg)
__field(uint64_t, tx_lasttried_txg)
__field(boolean_t, tx_anyobj)
- __field(boolean_t, tx_dirty_delayed)
+ __field(boolean_t, tx_waited)
__field(hrtime_t, tx_start)
__field(boolean_t, tx_wait_dirty)
__field(int, tx_err)
@@ -62,7 +62,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
__entry->tx_lastsnap_txg = tx->tx_lastsnap_txg;
__entry->tx_lasttried_txg = tx->tx_lasttried_txg;
__entry->tx_anyobj = tx->tx_anyobj;
- __entry->tx_dirty_delayed = tx->tx_dirty_delayed;
+ __entry->tx_waited = tx->tx_waited;
__entry->tx_start = tx->tx_start;
__entry->tx_wait_dirty = tx->tx_wait_dirty;
__entry->tx_err = tx->tx_err;
@@ -74,7 +74,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
"} dirty %llu min_tx_time %llu",
__entry->tx_txg, __entry->tx_lastsnap_txg,
__entry->tx_lasttried_txg, __entry->tx_anyobj,
- __entry->tx_dirty_delayed, __entry->tx_start,
+ __entry->tx_waited, __entry->tx_start,
__entry->tx_wait_dirty, __entry->tx_err,
__entry->dirty, __entry->min_tx_time)
);
--
2.17.1
More information about the kernel-team
mailing list