From: Seung-Woo Kim <sw0312.kim@samsung.com>
Date: Tue, 27 Feb 2024 02:00:32 +0000 (+0900)
Subject: kdbus: convert to file_operations iterate_shared for v6.6 or later version
X-Git-Tag: accepted/tizen/unified/20240306.011949~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2f59909f57f82fc24c89751e0b035fbf943d4bd;p=platform%2Fkernel%2Flinux-tizen-modules-source.git

kdbus: convert to file_operations iterate_shared for v6.6 or later version

Since the commit 3e3271549670 ("vfs: get rid of old '->iterate' directory
operation") of v6.6, struct file_operations::iterate is removed, and only
iterate_shared callback is used. Convert iterate to iterate_shared for
v6.6 or later kernel version.

Change-Id: I267bff76423820962d86177bc82250384c69bc7a
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

diff --git a/kernel/kdbus/fs.c b/kernel/kdbus/fs.c
index 6ab202e..25718eb 100644
--- a/kernel/kdbus/fs.c
+++ b/kernel/kdbus/fs.c
@@ -141,9 +141,17 @@ static int fs_dir_fop_release(struct inode *inode, struct file *file)
 	return 0;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0))
+WRAP_DIR_ITER(fs_dir_fop_iterate)
+#endif
+
 static const struct file_operations fs_dir_fops = {
 	.read		= generic_read_dir,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,6,0))
+	.iterate_shared	= shared_fs_dir_fop_iterate,
+#else
 	.iterate	= fs_dir_fop_iterate,
+#endif
 	.llseek		= fs_dir_fop_llseek,
 	.release	= fs_dir_fop_release,
 };