From: Kienan Stewart Date: Mon, 5 Feb 2024 13:52:29 +0000 (-0500) Subject: Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2da4de37de6382b4440737fdf4320e08a089afcd;p=lttng-modules.git Fix: ext4_discard_preallocations changed in linux 6.8.0-rc3 See upstream commit: commit f0e54b6087de9571ec61c189d6c378b81edbe3b2 Author: Kemeng Shi Date: Fri Jan 5 17:21:02 2024 +0800 ext4: remove 'needed' in trace_ext4_discard_preallocations As 'needed' to trace_ext4_discard_preallocations is always 0 which is meaningless. Just remove it. Change-Id: Ib6b698ca553c4beebd4ca791c83bbbb927901758 Signed-off-by: Kienan Stewart Signed-off-by: Mathieu Desnoyers --- diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h index 9fb216c5..605cac2a 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -416,7 +416,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_group_pa, ) ) -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(6,8,0)) +LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, + TP_PROTO(struct inode *inode, unsigned int len), + + TP_ARGS(inode, len), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(unsigned int, len, len) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,9,0) || \ LTTNG_KERNEL_RANGE(5,8,6, 5,9,0)) LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, TP_PROTO(struct inode *inode, unsigned int len, unsigned int needed),