summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Chase <[email protected]>2015-06-26 22:15:27 -0500
committerBrian Behlendorf <[email protected]>2015-06-29 09:21:58 -0700
commit84045c2ddfacd451cadfa0ea97617909c0137841 (patch)
tree6d5407f87624ac9880e52c40bb79145e1ac4ec0b
parenta254ecfc8b5b8fdd02a1bb88a0b2aa43bad183e9 (diff)
Remove l2ad_evict from zfs_l2arc_evict_class
Illumos 5701 (zpool list reports incorrect "alloc" value for cache devices) removed l2ad_evict from l2arc_dev_t. It should also be removed from the zfs_l2arc_evict_class event class. Signed-off-by: Tim Chase <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #3534
-rw-r--r--include/sys/trace_arc.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/sys/trace_arc.h b/include/sys/trace_arc.h
index b9df228ea..5d180b1d5 100644
--- a/include/sys/trace_arc.h
+++ b/include/sys/trace_arc.h
@@ -372,7 +372,6 @@ DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
__field(uint64_t, l2ad_hand)
__field(uint64_t, l2ad_start)
__field(uint64_t, l2ad_end)
- __field(uint64_t, l2ad_evict)
__field(boolean_t, l2ad_first)
__field(boolean_t, l2ad_writing)
@@ -387,7 +386,6 @@ DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
__entry->l2ad_hand = dev->l2ad_hand;
__entry->l2ad_start = dev->l2ad_start;
__entry->l2ad_end = dev->l2ad_end;
- __entry->l2ad_evict = dev->l2ad_evict;
__entry->l2ad_first = dev->l2ad_first;
__entry->l2ad_writing = dev->l2ad_writing;
@@ -395,12 +393,11 @@ DECLARE_EVENT_CLASS(zfs_l2arc_evict_class,
__entry->all = all;
),
TP_printk("l2ad { vdev { id %llu guid %llu state %llu } "
- "hand %llu start %llu end %llu evict %llu "
+ "hand %llu start %llu end %llu "
"first %d writing %d } taddr %llu all %d",
__entry->vdev_id, __entry->vdev_guid, __entry->vdev_state,
__entry->l2ad_hand, __entry->l2ad_start,
- __entry->l2ad_end, __entry->l2ad_evict,
- __entry->l2ad_first, __entry->l2ad_writing,
+ __entry->l2ad_end, __entry->l2ad_first, __entry->l2ad_writing,
__entry->taddr, __entry->all)
);