projects / packages / lttng-modules.git / blame
| Commit | Line | Data |
|---|---|---|
| 1d5f7193 JP |
1 | --- lttng-modules-2.13.7/include/instrumentation/events/jbd2.h.orig 2022-09-30 23:11:06.000000000 +0200 |
| 2 | +++ lttng-modules-2.13.7/include/instrumentation/events/jbd2.h 2023-01-08 14:25:51.090957315 +0100 | |
| 3 | @@ -15,6 +15,14 @@ | |
| 4 | struct transaction_run_stats_s; | |
| 5 | #endif | |
| 6 | ||
| 7 | +#ifndef _TRACE_JBD2_TID_T | |
| 8 | +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,1,4)) || (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,0,18) && LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(6,1,0)) | |
| 9 | +#define _TRACE_JBD2_TID_T tid_t | |
| 10 | +#else | |
| 11 | +#define _TRACE_JBD2_TID_T unsigned long | |
| 12 | +#endif | |
| 13 | +#endif | |
| 14 | + | |
| 15 | LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint, | |
| 16 | ||
| 17 | TP_PROTO(journal_t *journal, int result), | |
| 18 | @@ -102,14 +110,14 @@ | |
| 19 | ) | |
| 20 | ||
| 21 | LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, | |
| 22 | - TP_PROTO(dev_t dev, unsigned long tid, | |
| 23 | + TP_PROTO(dev_t dev, _TRACE_JBD2_TID_T tid, | |
| 24 | struct transaction_run_stats_s *stats), | |
| 25 | ||
| 26 | TP_ARGS(dev, tid, stats), | |
| 27 | ||
| 28 | TP_FIELDS( | |
| 29 | ctf_integer(dev_t, dev, dev) | |
| 30 | - ctf_integer(unsigned long, tid, tid) | |
| 31 | + ctf_integer(_TRACE_JBD2_TID_T, tid, tid) | |
| 32 | ctf_integer(unsigned long, wait, stats->rs_wait) | |
| 33 | ctf_integer(unsigned long, running, stats->rs_running) | |
| 34 | ctf_integer(unsigned long, locked, stats->rs_locked) | |
| 35 | @@ -122,14 +130,14 @@ | |
| 36 | ) | |
| 37 | ||
| 38 | LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats, | |
| 39 | - TP_PROTO(dev_t dev, unsigned long tid, | |
| 40 | + TP_PROTO(dev_t dev, _TRACE_JBD2_TID_T tid, | |
| 41 | struct transaction_chp_stats_s *stats), | |
| 42 | ||
| 43 | TP_ARGS(dev, tid, stats), | |
| 44 | ||
| 45 | TP_FIELDS( | |
| 46 | ctf_integer(dev_t, dev, dev) | |
| 47 | - ctf_integer(unsigned long, tid, tid) | |
| 48 | + ctf_integer(_TRACE_JBD2_TID_T, tid, tid) | |
| 49 | ctf_integer(unsigned long, chp_time, stats->cs_chp_time) | |
| 50 | ctf_integer(__u32, forced_to_close, stats->cs_forced_to_close) | |
| 51 | ctf_integer(__u32, written, stats->cs_written) |