diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:41 +0100 |
| commit | 0b201982fe1735dd41b35bc0a18d57a382b7da59 (patch) | |
| tree | 4208700b345863bbfdea87f64c37efb7d8a7b46f /include/trace | |
| parent | a90a987ebe008c941338285764e5afc0d663f54d (diff) | |
| parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) | |
spi: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/jbd2.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h index 8f5ee380d309..5646ae15a957 100644 --- a/include/trace/events/jbd2.h +++ b/include/trace/events/jbd2.h @@ -462,11 +462,9 @@ TRACE_EVENT(jbd2_shrink_scan_exit, TRACE_EVENT(jbd2_shrink_checkpoint_list, TP_PROTO(journal_t *journal, tid_t first_tid, tid_t tid, tid_t last_tid, - unsigned long nr_freed, unsigned long nr_scanned, - tid_t next_tid), + unsigned long nr_freed, tid_t next_tid), - TP_ARGS(journal, first_tid, tid, last_tid, nr_freed, - nr_scanned, next_tid), + TP_ARGS(journal, first_tid, tid, last_tid, nr_freed, next_tid), TP_STRUCT__entry( __field(dev_t, dev) @@ -474,7 +472,6 @@ TRACE_EVENT(jbd2_shrink_checkpoint_list, __field(tid_t, tid) __field(tid_t, last_tid) __field(unsigned long, nr_freed) - __field(unsigned long, nr_scanned) __field(tid_t, next_tid) ), @@ -484,15 +481,14 @@ TRACE_EVENT(jbd2_shrink_checkpoint_list, __entry->tid = tid; __entry->last_tid = last_tid; __entry->nr_freed = nr_freed; - __entry->nr_scanned = nr_scanned; __entry->next_tid = next_tid; ), TP_printk("dev %d,%d shrink transaction %u-%u(%u) freed %lu " - "scanned %lu next transaction %u", + "next transaction %u", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->first_tid, __entry->tid, __entry->last_tid, - __entry->nr_freed, __entry->nr_scanned, __entry->next_tid) + __entry->nr_freed, __entry->next_tid) ); #endif /* _TRACE_JBD2_H */ |