fix: jbd2: use the correct print format (v5.4.229)

See upstream commit :

  commit ecb9d0d2e123874bcdd2efdecda0f4e0c3dc566d
  Author: Bixuan Cui <cuibixuan@linux.alibaba.com>
  Date:   Tue Oct 11 19:33:44 2022 +0800

    jbd2: use the correct print format

    [ Upstream commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 ]

    The print format error was found when using ftrace event:
        <...>-1406 [000] .... 23599442.895823: jbd2_end_commit: dev 252,8 transaction -1866216965 sync 0 head -1866217368
        <...>-1406 [000] .... 23599442.896299: jbd2_start_commit: dev 252,8 transaction -1866216964 sync 0

    Use the correct print format for transaction, head and tid.

Change-Id: Ieee3d39ed1f2515e096e87d18b5ea8f921c54bd0
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h
index 48fd86d0903ca7e52fc7704c6a13632a08e96379..4605ff1d9c4d4983594d3475628fa7196e95a73f 100644 (file)
--- a/include/instrumentation/events/jbd2.h
+++ b/include/instrumentation/events/jbd2.h
@@ -28,6 +28,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
 )
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+       || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
        || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
        || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
        || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
@@ -97,6 +98,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(jbd2_commit, jbd2_drop_transaction,
 #endif
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+       || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
        || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
        || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
        || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \
@@ -140,6 +142,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data,
 )
 
 #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \
+       || LTTNG_KERNEL_RANGE(5,4,229, 5,5,0) \
        || LTTNG_KERNEL_RANGE(5,10,163, 5,11,0) \
        || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \
        || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \