New version

7 files changed, 10 insertions, 557 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28e68c6a3421..c9553ba6a9a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ntfs3-dkms-git
 	pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
-	pkgver = 5.15.r9.g52e00ea
-	pkgrel = 5
+	pkgver = 5.18.r1.gf26967b
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Paragon-Software-Group/linux-ntfs3
 	arch = any
@@ -15,15 +15,7 @@ pkgbase = ntfs3-dkms-git
 	options = !emptydirs
 	source = Makefile.patch
 	source = dkms.conf
-	source = kernel-5.12-backport.patch
-	source = kernel-5.14-backport.patch
-	source = kernel-5.15-backport.patch
-	source = kernel-5.16.patch
 	sha256sums = fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac
-	sha256sums = 1c7c30b21878f15d5eacc2fda563d94fd7491f1681818b7ca7a377c588abf2f4
-	sha256sums = b1674d6bb9b255a059efc4eae0846a426620a7a236dff19f4d0f85dfe2bbfd0d
-	sha256sums = f176a508596d0021beae0af264f2ef92d46062c7b12e89e4f4e8104d91118d85
-	sha256sums = 69c315bbb37e831adacedaa5eff1b32571ef86a24dcdb2a312a015bf824f6569
-	sha256sums = e61b3876ad3b474229ee6707cb7664783cdd6888676dfc433b49a45682083d5a
+	sha256sums = 82e2d9cc730188973d6c5ed91736373e5afbba74f7a73003dd38761800ac8bd9
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 87f71754f0c2..6b9d22448681 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=ntfs3-dkms-git
-pkgver=5.15.r9.g52e00ea
-pkgrel=5
+pkgver=5.18.r1.gf26967b
+pkgrel=1
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
 arch=('any')
@@ -12,28 +12,18 @@ provides=('NTFS3-MODULE' 'ntfs3')
 conflicts=('ntfs3')
 options=('!strip' '!emptydirs')
 
-_patches=(
-    "kernel-5."{12,14,15}"-backport.patch"
-    "kernel-5.16.patch"
-)
-
 source=(
     "Makefile.patch"
     "dkms.conf"
-    "${_patches[@]}"
 )
 
 sha256sums=(
     'fd4cf0e2dc160efecc55d4ea99667669b870599e4e81be435ec2201381b7e2ac'
-    '1c7c30b21878f15d5eacc2fda563d94fd7491f1681818b7ca7a377c588abf2f4'
-    'b1674d6bb9b255a059efc4eae0846a426620a7a236dff19f4d0f85dfe2bbfd0d'
-    'f176a508596d0021beae0af264f2ef92d46062c7b12e89e4f4e8104d91118d85'
-    '69c315bbb37e831adacedaa5eff1b32571ef86a24dcdb2a312a015bf824f6569'
-    'e61b3876ad3b474229ee6707cb7664783cdd6888676dfc433b49a45682083d5a'
+    '82e2d9cc730188973d6c5ed91736373e5afbba74f7a73003dd38761800ac8bd9'
 )
 
-_ver="5.15"
-_since="1635713590"
+_ver="5.18"
+_since="1653249151"
 
 # The whole kernel history is very huge, so downloading it is a pain.
 # Also commits count is insane and we don't want to see all that in pkgver.
@@ -61,12 +51,6 @@ prepare() {
 
     cd "fs/ntfs3"
     patch -i "${srcdir}/Makefile.patch"
-
-    # For testing
-    # patch -i "${srcdir}/${_patches[-1]}"
-    # patch -i "${srcdir}/${_patches[-2]}"
-    # patch -i "${srcdir}/${_patches[-3]}"
-    # patch -i "${srcdir}/${_patches[-4]}"
 }
 
 package() {
@@ -75,7 +59,6 @@ package() {
 
     cd "${srcdir}"
     install -Dm644 -t "${dest}" "dkms.conf"
-    install -Dm644 -t "${dest}/patches" "${_patches[@]}"
 
     cd "repo/fs/ntfs3"
     cp -rt "${dest}" *
diff --git a/dkms.conf b/dkms.conf
index 69362ffce40e..2321dffbe3aa 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,15 +1,7 @@
 PACKAGE_NAME="ntfs3"
-PACKAGE_VERSION="5.15"
+PACKAGE_VERSION="5.18"
 BUILT_MODULE_NAME[0]="ntfs3"
 DEST_MODULE_LOCATION[0]="/kernel/fs/ntfs3"
 AUTOINSTALL="yes"
 MAKE[0]="KVERSION=$kernelver CONFIG_NTFS3_FS=m CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y make KDIR=$kernel_source_dir"
-BUILD_EXCLUSIVE_KERNEL="^5\..*"
-PATCH[0]="kernel-5.16.patch"
-PATCH_MATCH[0]="^(5\.1[6-9]\.).*"
-PATCH[1]="kernel-5.15-backport.patch"
-PATCH_MATCH[1]="^(5\.[0-9]\.|5\.1[0-4]\.).*"
-PATCH[2]="kernel-5.14-backport.patch"
-PATCH_MATCH[2]="^(5\.[0-9]\.|5\.1[0-3]\.).*"
-PATCH[3]="kernel-5.12-backport.patch"
-PATCH_MATCH[3]="^(5\.[0-9]\.|5\.1[0-1]\.).*"
+BUILD_EXCLUSIVE_KERNEL="^5\.18\.?*"
diff --git a/kernel-5.12-backport.patch b/kernel-5.12-backport.patch
deleted file mode 100644
index b85af5b2feb9..000000000000
--- a/kernel-5.12-backport.patch
+++ /dev/null
@@ -1,440 +0,0 @@
---- a/file.c
-+++ b/file.c
-@@ -69,7 +69,7 @@
- /*
-  * ntfs_getattr - inode_operations::getattr
-  */
--int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,
-+int ntfs_getattr(const struct path *path,
- 		 struct kstat *stat, u32 request_mask, u32 flags)
- {
- 	struct inode *inode = d_inode(path->dentry);
-@@ -83,7 +83,7 @@
- 
- 	stat->attributes_mask |= STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED;
- 
--	generic_fillattr(mnt_userns, inode, stat);
-+	generic_fillattr(inode, stat);
- 
- 	stat->result_mask |= STATX_BTIME;
- 	stat->btime = ni->i_crtime;
-@@ -734,7 +734,7 @@
- /*
-  * ntfs3_setattr - inode_operations::setattr
-  */
--int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
-+int ntfs3_setattr(struct dentry *dentry,
- 		  struct iattr *attr)
- {
- 	struct super_block *sb = dentry->d_sb;
-@@ -753,7 +753,7 @@
- 		ia_valid = attr->ia_valid;
- 	}
- 
--	err = setattr_prepare(mnt_userns, dentry, attr);
-+	err = setattr_prepare(dentry, attr);
- 	if (err)
- 		goto out;
- 
-@@ -778,10 +778,10 @@
- 		ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
- 	}
- 
--	setattr_copy(mnt_userns, inode, attr);
-+	setattr_copy(inode, attr);
- 
- 	if (mode != inode->i_mode) {
--		err = ntfs_acl_chmod(mnt_userns, inode);
-+		err = ntfs_acl_chmod(inode);
- 		if (err)
- 			goto out;
- 
-
---- a/fsntfs.c
-+++ b/fsntfs.c
-@@ -1599,7 +1599,7 @@
- 		lbo = (u64)lcn << cluster_bits;
- 		len = (u64)clen << cluster_bits;
- new_bio:
--		new = ntfs_alloc_bio(BIO_MAX_VECS);
-+		new = ntfs_alloc_bio(BIO_MAX_PAGES);
- 		if (!new) {
- 			err = -ENOMEM;
- 			break;
-
---- a/inode.c
-+++ b/inode.c
-@@ -1167,7 +1167,7 @@
- 	return ERR_PTR(err);
- }
- 
--struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,
-+struct inode *ntfs_create_inode(
- 				struct inode *dir, struct dentry *dentry,
- 				const struct cpu_str *uni, umode_t mode,
- 				dev_t dev, const char *symname, u32 size,
-@@ -1284,7 +1284,7 @@
- 		goto out3;
- 	}
- 	inode = &ni->vfs_inode;
--	inode_init_owner(mnt_userns, inode, dir, mode);
-+	inode_init_owner(inode, dir, mode);
- 	mode = inode->i_mode;
- 
- 	inode->i_atime = inode->i_mtime = inode->i_ctime = ni->i_crtime =
-@@ -1583,7 +1583,7 @@
- 
- #ifdef CONFIG_NTFS3_FS_POSIX_ACL
- 	if (!S_ISLNK(mode) && (sb->s_flags & SB_POSIXACL)) {
--		err = ntfs_init_acl(mnt_userns, inode, dir);
-+		err = ntfs_init_acl(inode, dir);
- 		if (err)
- 			goto out7;
- 	} else
-
---- a/namei.c
-+++ b/namei.c
-@@ -92,12 +92,12 @@
- /*
-  * ntfs_create - inode_operations::create
-  */
--static int ntfs_create(struct user_namespace *mnt_userns, struct inode *dir,
-+static int ntfs_create(struct inode *dir,
- 		       struct dentry *dentry, umode_t mode, bool excl)
- {
- 	struct inode *inode;
- 
--	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFREG | mode,
-+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFREG | mode,
- 				  0, NULL, 0, NULL);
- 
- 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;
-@@ -108,12 +108,12 @@
-  *
-  * inode_operations::mknod
-  */
--static int ntfs_mknod(struct user_namespace *mnt_userns, struct inode *dir,
-+static int ntfs_mknod(struct inode *dir,
- 		      struct dentry *dentry, umode_t mode, dev_t rdev)
- {
- 	struct inode *inode;
- 
--	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, mode, rdev,
-+	inode = ntfs_create_inode(dir, dentry, NULL, mode, rdev,
- 				  NULL, 0, NULL);
- 
- 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;
-@@ -181,13 +181,13 @@
- /*
-  * ntfs_symlink - inode_operations::symlink
-  */
--static int ntfs_symlink(struct user_namespace *mnt_userns, struct inode *dir,
-+static int ntfs_symlink(struct inode *dir,
- 			struct dentry *dentry, const char *symname)
- {
- 	u32 size = strlen(symname);
- 	struct inode *inode;
- 
--	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFLNK | 0777,
-+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFLNK | 0777,
- 				  0, symname, size, NULL);
- 
- 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;
-@@ -196,12 +196,12 @@
- /*
-  * ntfs_mkdir- inode_operations::mkdir
-  */
--static int ntfs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
-+static int ntfs_mkdir(struct inode *dir,
- 		      struct dentry *dentry, umode_t mode)
- {
- 	struct inode *inode;
- 
--	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFDIR | mode,
-+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFDIR | mode,
- 				  0, NULL, 0, NULL);
- 
- 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;
-@@ -227,7 +227,7 @@
- /*
-  * ntfs_rename - inode_operations::rename
-  */
--static int ntfs_rename(struct user_namespace *mnt_userns, struct inode *dir,
-+static int ntfs_rename(struct inode *dir,
- 		       struct dentry *dentry, struct inode *new_dir,
- 		       struct dentry *new_dentry, u32 flags)
- {
-
---- a/ntfs_fs.h
-+++ b/ntfs_fs.h
-@@ -486,11 +486,11 @@
- extern const struct file_operations ntfs_dir_operations;
- 
- /* Globals from file.c */
--int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,
-+int ntfs_getattr(const struct path *path,
- 		 struct kstat *stat, u32 request_mask, u32 flags);
- void ntfs_sparse_cluster(struct inode *inode, struct page *page0, CLST vcn,
- 			 CLST len);
--int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
-+int ntfs3_setattr(struct dentry *dentry,
- 		  struct iattr *attr);
- int ntfs_file_open(struct inode *inode, struct file *file);
- int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
-@@ -695,7 +695,7 @@
- int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,
- 		      struct inode *i2);
- int inode_write_data(struct inode *inode, const void *data, size_t bytes);
--struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,
-+struct inode *ntfs_create_inode(
- 				struct inode *dir, struct dentry *dentry,
- 				const struct cpu_str *uni, umode_t mode,
- 				dev_t dev, const char *symname, u32 size,
-@@ -837,17 +837,17 @@
- /* globals from xattr.c */
- #ifdef CONFIG_NTFS3_FS_POSIX_ACL
- struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
--int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_set_acl(struct inode *inode,
- 		 struct posix_acl *acl, int type);
--int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_init_acl(struct inode *inode,
- 		  struct inode *dir);
- #else
- #define ntfs_get_acl NULL
- #define ntfs_set_acl NULL
- #endif
- 
--int ntfs_acl_chmod(struct user_namespace *mnt_userns, struct inode *inode);
--int ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_acl_chmod(struct inode *inode);
-+int ntfs_permission(struct inode *inode,
- 		    int mask);
- ssize_t ntfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
- extern const struct xattr_handler *ntfs_xattr_handlers[];
-
---- a/super.c
-+++ b/super.c
-@@ -514,9 +514,9 @@
- 	struct user_namespace *user_ns = seq_user_ns(m);
- 
- 	seq_printf(m, ",uid=%u",
--		  from_kuid_munged(user_ns, opts->fs_uid));
-+		  from_kuid_munged(&init_user_ns, opts->fs_uid));
- 	seq_printf(m, ",gid=%u",
--		  from_kgid_munged(user_ns, opts->fs_gid));
-+		  from_kgid_munged(&init_user_ns, opts->fs_gid));
- 	if (opts->fmask)
- 		seq_printf(m, ",fmask=%04o", ~opts->fs_fmask_inv);
- 	if (opts->dmask)
-@@ -1435,7 +1435,7 @@
- 	.init_fs_context	= ntfs_init_fs_context,
- 	.parameters		= ntfs_fs_parameters,
- 	.kill_sb		= kill_block_super,
--	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,
-+	.fs_flags		= FS_REQUIRES_DEV,
- };
- // clang-format on
- 
-
---- a/xattr.c
-+++ b/xattr.c
-@@ -478,7 +478,7 @@
- }
- 
- #ifdef CONFIG_NTFS3_FS_POSIX_ACL
--static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,
-+static struct posix_acl *ntfs_get_acl_ex(
- 					 struct inode *inode, int type,
- 					 int locked)
- {
-@@ -514,7 +514,7 @@
- 
- 	/* Translate extended attribute to acl. */
- 	if (err >= 0) {
--		acl = posix_acl_from_xattr(mnt_userns, buf, err);
-+		acl = posix_acl_from_xattr(&init_user_ns, buf, err);
- 	} else if (err == -ENODATA) {
- 		acl = NULL;
- 	} else {
-@@ -535,10 +535,10 @@
- struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
- {
- 	/* TODO: init_user_ns? */
--	return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);
-+	return ntfs_get_acl_ex(inode, type, 0);
- }
- 
--static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
-+static noinline int ntfs_set_acl_ex(
- 				    struct inode *inode, struct posix_acl *acl,
- 				    int type, bool init_acl)
- {
-@@ -557,7 +557,7 @@
- 		if (acl && !init_acl) {
- 			umode_t mode;
- 
--			err = posix_acl_update_mode(mnt_userns, inode, &mode,
-+			err = posix_acl_update_mode(inode, &mode,
- 						    &acl);
- 			if (err)
- 				goto out;
-@@ -592,7 +592,7 @@
- 		value = kmalloc(size, GFP_NOFS);
- 		if (!value)
- 			return -ENOMEM;
--		err = posix_acl_to_xattr(mnt_userns, acl, value, size);
-+		err = posix_acl_to_xattr(&init_user_ns, acl, value, size);
- 		if (err < 0)
- 			goto out;
- 		flags = 0;
-@@ -613,13 +613,13 @@
- /*
-  * ntfs_set_acl - inode_operations::set_acl
-  */
--int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_set_acl(struct inode *inode,
- 		 struct posix_acl *acl, int type)
- {
--	return ntfs_set_acl_ex(mnt_userns, inode, acl, type, false);
-+	return ntfs_set_acl_ex(inode, acl, type, false);
- }
- 
--static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns,
-+static int ntfs_xattr_get_acl(
- 			      struct inode *inode, int type, void *buffer,
- 			      size_t size)
- {
-@@ -638,7 +638,7 @@
- 	if (!acl)
- 		return -ENODATA;
- 
--	err = posix_acl_to_xattr(mnt_userns, acl, buffer, size);
-+	err = posix_acl_to_xattr(&init_user_ns, acl, buffer, size);
- 	posix_acl_release(acl);
- 
- 	return err;
- }
- 
--static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns,
-+static int ntfs_xattr_set_acl(
- 			      struct inode *inode, int type, const void *value,
- 			      size_t size)
- {
-@@ -656,24 +656,24 @@
- 		return -EOPNOTSUPP;
- 	}
- 
--	if (!inode_owner_or_capable(mnt_userns, inode))
-+	if (!inode_owner_or_capable(inode))
- 		return -EPERM;
- 
- 	if (!value) {
- 		acl = NULL;
- 	} else {
--		acl = posix_acl_from_xattr(mnt_userns, value, size);
-+		acl = posix_acl_from_xattr(&init_user_ns, value, size);
- 		if (IS_ERR(acl))
- 			return PTR_ERR(acl);
- 
- 		if (acl) {
--			err = posix_acl_valid(mnt_userns, acl);
-+			err = posix_acl_valid(&init_user_ns, acl);
- 			if (err)
- 				goto release_and_out;
- 		}
- 	}
- 
--	err = ntfs_set_acl(mnt_userns, inode, acl, type);
-+	err = ntfs_set_acl(inode, acl, type);
- 
- release_and_out:
- 	posix_acl_release(acl);
-@@ -685,7 +685,7 @@
-  *
-  * Called from ntfs_create_inode().
-  */
--int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_init_acl(struct inode *inode,
- 		  struct inode *dir)
- {
- 	struct posix_acl *default_acl, *acl;
-@@ -696,7 +696,7 @@
- 		return err;
- 
- 	if (default_acl) {
--		err = ntfs_set_acl_ex(mnt_userns, inode, default_acl,
-+		err = ntfs_set_acl_ex(inode, default_acl,
- 				      ACL_TYPE_DEFAULT, true);
- 		posix_acl_release(default_acl);
- 	} else {
-@@ -707,7 +707,7 @@
- 		inode->i_acl = NULL;
- 	else {
- 		if (!err)
--			err = ntfs_set_acl_ex(mnt_userns, inode, acl,
-+			err = ntfs_set_acl_ex(inode, acl,
- 					      ACL_TYPE_ACCESS, true);
- 		posix_acl_release(acl);
- 	}
-@@ -719,7 +719,7 @@
- /*
-  * ntfs_acl_chmod - Helper for ntfs3_setattr().
-  */
--int ntfs_acl_chmod(struct user_namespace *mnt_userns, struct inode *inode)
-+int ntfs_acl_chmod(struct inode *inode)
- {
- 	struct super_block *sb = inode->i_sb;
- 
-@@ -729,13 +729,13 @@
- 	if (S_ISLNK(inode->i_mode))
- 		return -EOPNOTSUPP;
- 
--	return posix_acl_chmod(mnt_userns, inode, inode->i_mode);
-+	return posix_acl_chmod(inode, inode->i_mode);
- }
- 
- /*
-  * ntfs_permission - inode_operations::permission
-  */
--int ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
-+int ntfs_permission(struct inode *inode,
- 		    int mask)
- {
- 	if (ntfs_sb(inode->i_sb)->options->noacsrules) {
-@@ -743,7 +743,7 @@
- 		return 0;
- 	}
- 
--	return generic_permission(mnt_userns, inode, mask);
-+	return generic_permission(inode, mask);
- }
- 
- /*
-@@ -855,7 +855,7 @@
- 		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
- 		/* TODO: init_user_ns? */
- 		err = ntfs_xattr_get_acl(
--			&init_user_ns, inode,
-+			inode,
- 			name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1
- 				? ACL_TYPE_ACCESS
- 				: ACL_TYPE_DEFAULT,
-@@ -874,7 +874,7 @@
-  * ntfs_setxattr - inode_operations::setxattr
-  */
- static noinline int ntfs_setxattr(const struct xattr_handler *handler,
--				  struct user_namespace *mnt_userns,
-+				  
- 				  struct dentry *de, struct inode *inode,
- 				  const char *name, const void *value,
- 				  size_t size, int flags)
-@@ -983,7 +983,7 @@
- 	     !memcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT,
- 		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
- 		err = ntfs_xattr_set_acl(
--			mnt_userns, inode,
-+			inode,
- 			name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1
- 				? ACL_TYPE_ACCESS
- 				: ACL_TYPE_DEFAULT,
diff --git a/kernel-5.14-backport.patch b/kernel-5.14-backport.patch
deleted file mode 100644
index a2d303b4cdbd..000000000000
--- a/kernel-5.14-backport.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/file.c
-+++ b/file.c
-@@ -1034,10 +1034,10 @@
- 			size_t cp, tail = PAGE_SIZE - off;
- 
- 			page = pages[ip];
--			cp = copy_page_from_iter_atomic(page, off,
--							min(tail, bytes), from);
-+			cp = iov_iter_copy_from_user_atomic(page, from, off,
-+							    min(tail, bytes));
- 			flush_dcache_page(page);
--
-+			iov_iter_advance(from, cp);
- 			copied += cp;
- 			bytes -= cp;
- 			if (!bytes || !cp)
diff --git a/kernel-5.15-backport.patch b/kernel-5.15-backport.patch
deleted file mode 100644
index 40a6bd1babf8..000000000000
--- a/kernel-5.15-backport.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/ntfs_fs.h
-+++ b/ntfs_fs.h
-@@ -836,7 +836,7 @@
- 
- /* globals from xattr.c */
- #ifdef CONFIG_NTFS3_FS_POSIX_ACL
--struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu);
-+struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
- int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
- 		 struct posix_acl *acl, int type);
- int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,
-
---- a/xattr.c
-+++ b/xattr.c
-@@ -532,11 +532,8 @@
- /*
-  * ntfs_get_acl - inode_operations::get_acl
-  */
--struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu)
-+struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
- {
--	if (rcu)
--		return ERR_PTR(-ECHILD);
--
- 	/* TODO: init_user_ns? */
- 	return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);
- }
-@@ -634,7 +634,7 @@
- 		return -EOPNOTSUPP;
- 	}
- 
--	acl = ntfs_get_acl(inode, type, false);
-+	acl = ntfs_get_acl(inode, type);
- 	if (IS_ERR(acl))
- 		return PTR_ERR(acl);
- 
diff --git a/kernel-5.16.patch b/kernel-5.16.patch
deleted file mode 100644
index 89ddcd039432..000000000000
--- a/kernel-5.16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/file.c
-+++ b/file.c
-@@ -995,7 +990,7 @@
- 		frame_vbo = pos & ~(frame_size - 1);
- 		index = frame_vbo >> PAGE_SHIFT;
- 
--		if (unlikely(iov_iter_fault_in_readable(from, bytes))) {
-+		if (unlikely(fault_in_iov_iter_readable(from, bytes))) {
- 			err = -EFAULT;
- 			goto out;
- 		}
-
---- a/ntfs_fs.h
-+++ b/ntfs_fs.h
-@@ -11,7 +11,6 @@
- 
- #include <linux/blkdev.h>
- #include <linux/buffer_head.h>
--#include <linux/cleancache.h>
- #include <linux/fs.h>
- #include <linux/highmem.h>
- #include <linux/kernel.h>