From ad35eef335594695064d7c1ddcb53274c2690fff Mon Sep 17 00:00:00 2001 From: Gleb Chesnokov Date: Mon, 8 Jul 2024 10:50:39 +0300 Subject: [PATCH] scst/include/backport.h: Port to Linux kernel v6.10 Support for the following fs layer changes in the Linux kernel v6.10: - 7c98f7cb8fda ("remove call_{read,write}_iter() functions") --- scst/include/backport.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 97e46c9fa..c54027707 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -553,10 +553,12 @@ typedef unsigned int __poll_t; #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) + (LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) || \ + LINUX_VERSION_CODE >= KERNEL_VERSION(6, 10, 0)) /* * See also commit bb7462b6fd64 ("vfs: use helpers for calling - * f_op->{read,write}_iter()"). + * f_op->{read,write}_iter()") # v4.11. + * See also commit 7c98f7cb8fda ("remove call_{read,write}_iter() functions") # v6.10. */ static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio, struct iov_iter *iter)