kdbus: convert to file_operations iterate_shared for v6.6 or later version 88/306888/2
authorSeung-Woo Kim <sw0312.kim@samsung.com>
Tue, 27 Feb 2024 02:00:32 +0000 (11:00 +0900)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 1 Mar 2024 22:08:11 +0000 (23:08 +0100)
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>
kernel/kdbus/fs.c

index 6ab202e8a43f74f440419d8f64467a2ce905ba4b..25718ebc737a9cf88195f12a095bcfe0587ae3c7 100644 (file)
@@ -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,
 };