zfs-patches/0036-tx_waited-tx_dirty_delayed-in-trace_dmu.h.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Dr=2E=20Andr=C3=A1s=20Korn?=
   3  <korn-github.com@elan.rulez.org>
   4 Date: Tue, 30 Jan 2018 11:34:39 +0100
   5 Subject: [PATCH] tx_waited -> tx_dirty_delayed in trace_dmu.h
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This change was missed in 0735ecb33485e91a78357a274e47c2782858d8b9.
  11
  12 Reviewed-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  13 Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
  14 Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
  15 Signed-off-by: András Korn <korn-github.com@elan.rulez.org>
  16 Closes #7096
  17
  18 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  19 ---
  20  include/sys/trace_dmu.h | 11 ++++++-----
  21  1 file changed, 6 insertions(+), 5 deletions(-)
  22
  23 diff --git a/include/sys/trace_dmu.h b/include/sys/trace_dmu.h
  24 index 5ae59e563..24e57f514 100644
  25 --- a/include/sys/trace_dmu.h
  26 +++ b/include/sys/trace_dmu.h
  27 @@ -50,7 +50,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
  28             __field(uint64_t,                   tx_lastsnap_txg)
  29             __field(uint64_t,                   tx_lasttried_txg)
  30             __field(boolean_t,                  tx_anyobj)
  31 -           __field(boolean_t,                  tx_waited)
  32 +           __field(boolean_t,                  tx_dirty_delayed)
  33             __field(hrtime_t,                   tx_start)
  34             __field(boolean_t,                  tx_wait_dirty)
  35             __field(int,                        tx_err)
  36 @@ -62,7 +62,7 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
  37             __entry->tx_lastsnap_txg            = tx->tx_lastsnap_txg;
  38             __entry->tx_lasttried_txg           = tx->tx_lasttried_txg;
  39             __entry->tx_anyobj                  = tx->tx_anyobj;
  40 -           __entry->tx_waited                  = tx->tx_waited;
  41 +           __entry->tx_dirty_delayed           = tx->tx_dirty_delayed;
  42             __entry->tx_start                   = tx->tx_start;
  43             __entry->tx_wait_dirty              = tx->tx_wait_dirty;
  44             __entry->tx_err                     = tx->tx_err;
  45 @@ -70,11 +70,12 @@ DECLARE_EVENT_CLASS(zfs_delay_mintime_class,
  46             __entry->min_tx_time                = min_tx_time;
  47         ),
  48         TP_printk("tx { txg %llu lastsnap_txg %llu tx_lasttried_txg %llu "
  49 -           "anyobj %d waited %d start %llu wait_dirty %d err %i "
  50 +           "anyobj %d dirty_delayed %d start %llu wait_dirty %d err %i "
  51             "} dirty %llu min_tx_time %llu",
  52             __entry->tx_txg, __entry->tx_lastsnap_txg,
  53 -           __entry->tx_lasttried_txg, __entry->tx_anyobj, __entry->tx_waited,
  54 -           __entry->tx_start, __entry->tx_wait_dirty, __entry->tx_err,
  55 +           __entry->tx_lasttried_txg, __entry->tx_anyobj,
  56 +           __entry->tx_dirty_delayed, __entry->tx_start,
  57 +           __entry->tx_wait_dirty, __entry->tx_err,
  58             __entry->dirty, __entry->min_tx_time)
  59  );
  60  /* END CSTYLED */