From b5d1c38665cd69d7d1c94231fe0609da5c8afbc3 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 8 Jun 2022 13:07:59 -0400 Subject: [PATCH 2/3] fix: fs: Remove flags parameter from aops->write_begin (v5.19) See upstream commit : commit 9d6b0cd7579844761ed68926eb3073bab1dca87b Author: Matthew Wilcox (Oracle) Date: Tue Feb 22 14:31:43 2022 -0500 fs: Remove flags parameter from aops->write_begin There are no more aop flags left, so remove the parameter. Upstream-Status: Backport Change-Id: I82725b93e13d749f52a631b2ac60df81a5e839f8 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- include/instrumentation/events/ext4.h | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h index 513762c0..222416ec 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -122,6 +122,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, ) ) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, + + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), + + TP_ARGS(inode, pos, len), + + TP_FIELDS( + ctf_integer(dev_t, dev, inode->i_sb->s_dev) + ctf_integer(ino_t, ino, inode->i_ino) + ctf_integer(loff_t, pos, pos) + ctf_integer(unsigned int, len, len) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin, + + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), + + TP_ARGS(inode, pos, len) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, + + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), + + TP_ARGS(inode, pos, len) +) +#else LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, @@ -153,6 +182,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, TP_ARGS(inode, pos, len, flags) ) +#endif LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end, TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, -- 2.19.1