From 4aa9d66de7a8e4fd6fb169fc1efda58dab01a6f8 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Wed, 28 Feb 2024 11:17:28 +0100 Subject: [PATCH] kdbus: remove flags parameter from aops->write_begin for kernel v5.19+ Since commit 9d6b0cd75798 ("fs: Remove flags parameter from aops->write_begin"), included in v5.19, the flags parameter has been removed, so adapt kdbus code for this change. Change-Id: I56729e1302dfaf561671babdc936165ee1599da7 Signed-off-by: Marek Szyprowski --- kernel/kdbus/pool.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/kdbus/pool.c b/kernel/kdbus/pool.c index 565f9d0..381a119 100644 --- a/kernel/kdbus/pool.c +++ b/kernel/kdbus/pool.c @@ -661,8 +661,13 @@ int kdbus_pool_slice_copy(const struct kdbus_pool_slice *slice_dst, copy_len = min_t(unsigned long, PAGE_SIZE - page_off, len); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,19,0)) + status = aops->write_begin(f_dst, mapping_dst, off_dst, + copy_len, &page, &fsdata); +#else status = aops->write_begin(f_dst, mapping_dst, off_dst, copy_len, 0, &page, &fsdata); +#endif if (unlikely(status < 0)) { ret = status; break; -- 2.34.1