From dd7be14bd04c1de309ba267097b03a308da87dae Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 17 Jan 2023 11:03:12 -0500 Subject: [PATCH] fix: jbd2: use the correct print format (v5.10.163) See upstream commit : commit d87a7b4c77a997d5388566dd511ca8e6b8e8a0a8 Author: Bixuan Cui Date: Tue Oct 11 19:33:44 2022 +0800 jbd2: use the correct print format 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: I7601f5cbb86495c2607be7b11e02724c90b3ebf9 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Upstream-Status: Backport Signed-off-by: Armin Kuster --- include/instrumentation/events/jbd2.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/instrumentation/events/jbd2.h b/include/instrumentation/events/jbd2.h index d5d8ea0c..f7993511 100644 --- 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,10,163, 6,0,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) @@ -96,6 +97,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,10,163, 6,0,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) @@ -138,6 +140,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, ) #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,2,0) \ + || LTTNG_KERNEL_RANGE(5,10,163, 6,0,0) \ || LTTNG_KERNEL_RANGE(5,15,87, 5,16,0) \ || LTTNG_KERNEL_RANGE(6,0,18, 6,1,0) \ || LTTNG_KERNEL_RANGE(6,1,4, 6,2,0)) -- 2.35.4