From 1cf04b01a597fda33a4bb1ef79e3d6f4dcfed16e Mon Sep 17 00:00:00 2001 From: Gleb Chesnokov Date: Mon, 27 Feb 2023 12:04:14 +0300 Subject: [PATCH] scst_lib: Port to Linux kernel v6.3 Support for the following fs changes in the Linux kernel v6.3: - abf08576afe3 ("fs: port vfs_*() helpers to struct mnt_idmap") --- scst/src/scst_lib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c index a00bfccae..868406000 100644 --- a/scst/src/scst_lib.c +++ b/scst/src/scst_lib.c @@ -15063,9 +15063,12 @@ void scst_vfs_unlink_and_put(struct path *path) vfs_unlink(path->dentry->d_parent->d_inode, path->dentry); #elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 12, 0) vfs_unlink(path->dentry->d_parent->d_inode, path->dentry, NULL); -#else +#elif LINUX_VERSION_CODE < KERNEL_VERSION(6, 3, 0) vfs_unlink(&init_user_ns, path->dentry->d_parent->d_inode, path->dentry, NULL); +#else + vfs_unlink(&nop_mnt_idmap, path->dentry->d_parent->d_inode, path->dentry, + NULL); #endif path_put(path); }