Update patches

4 files changed, 34 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9964613e429..722e73ad9a64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.r5.g3a2154b
+	pkgver = 5.15.r9.g52e00ea
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Paragon-Software-Group/linux-ntfs3
@@ -21,8 +21,8 @@ pkgbase = ntfs3-dkms-git
 	source = kernel-5.15-backport.patch
 	sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
 	sha512sums = 5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677
-	sha512sums = 3b0126a8f0765ede9c2e3f6e521941fbbef35726e0b6a37edce122181dbef47d9633e2ef06669115d50714193816db8e2ac785fbe3295a62088365abedab49c4
-	sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
+	sha512sums = 139c88d394cf6372f539825ebd70024f2edbccca6f97eab15a8460aede38926b3aee0dce18bbdb129f91040878ed8dc6ef84064568e9b6404cfba86640bafc39
+	sha512sums = 1644192df72ce80d0244e21b2c429785106b0bba179a06c5babd92b6d1b09ad28771eeb63f953ecb65ed616ab2d6b1744f1465c905ae8080c6b01c8d7e164005
 	sha512sums = c061d3d3b0e531f6d0eba533b884c168a3b057d96d68000cdb9e0fc736538cdc4e7e38d0168f58c3c1b8cb1a7c413f4fb32068847b8c4601dc0406f3fead7533
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 9dc249d282ac..8b69ee950186 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _base="8bb7eca972ad531c9b149c0a51ab43a417385813"
 _head="master"
 
 pkgname=ntfs3-dkms-git
-pkgver=5.15.r5.g3a2154b
+pkgver=5.15.r9.g52e00ea
 pkgrel=1
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
@@ -28,8 +28,8 @@ source=(
 sha512sums=(
     '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
     '5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677'
-    '3b0126a8f0765ede9c2e3f6e521941fbbef35726e0b6a37edce122181dbef47d9633e2ef06669115d50714193816db8e2ac785fbe3295a62088365abedab49c4'
-    '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
+    '139c88d394cf6372f539825ebd70024f2edbccca6f97eab15a8460aede38926b3aee0dce18bbdb129f91040878ed8dc6ef84064568e9b6404cfba86640bafc39'
+    '1644192df72ce80d0244e21b2c429785106b0bba179a06c5babd92b6d1b09ad28771eeb63f953ecb65ed616ab2d6b1744f1465c905ae8080c6b01c8d7e164005'
     'c061d3d3b0e531f6d0eba533b884c168a3b057d96d68000cdb9e0fc736538cdc4e7e38d0168f58c3c1b8cb1a7c413f4fb32068847b8c4601dc0406f3fead7533'
 )
 
diff --git a/kernel-5.12-backport.patch b/kernel-5.12-backport.patch
index 7d268f207dcf..e104d08576c0 100644
--- a/kernel-5.12-backport.patch
+++ b/kernel-5.12-backport.patch
@@ -18,7 +18,7 @@
  
  	stat->result_mask |= STATX_BTIME;
  	stat->btime = ni->i_crtime;
-@@ -728,7 +728,7 @@
+@@ -734,7 +734,7 @@
  /*
   * ntfs3_setattr - inode_operations::setattr
   */
@@ -27,7 +27,7 @@
  		  struct iattr *attr)
  {
  	struct super_block *sb = dentry->d_sb;
-@@ -747,7 +747,7 @@
+@@ -753,7 +753,7 @@
  		ia_valid = attr->ia_valid;
  	}
  
@@ -36,7 +36,7 @@
  	if (err)
  		goto out;
  
-@@ -772,10 +772,10 @@
+@@ -778,10 +778,10 @@
  		ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
  	}
  
@@ -64,7 +64,7 @@
 
 --- a/inode.c
 +++ b/inode.c
-@@ -1163,7 +1163,7 @@
+@@ -1167,7 +1167,7 @@
  	return ERR_PTR(err);
  }
  
@@ -73,7 +73,7 @@
  				struct inode *dir, struct dentry *dentry,
  				const struct cpu_str *uni, umode_t mode,
  				dev_t dev, const char *symname, u32 size,
-@@ -1280,7 +1280,7 @@
+@@ -1284,7 +1284,7 @@
  		goto out3;
  	}
  	inode = &ni->vfs_inode;
@@ -82,7 +82,7 @@
  	mode = inode->i_mode;
  
  	inode->i_atime = inode->i_mtime = inode->i_ctime = ni->i_crtime =
-@@ -1579,7 +1579,7 @@
+@@ -1583,7 +1583,7 @@
  
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL
  	if (!S_ISLNK(mode) && (sb->s_flags & SB_POSIXACL)) {
@@ -268,18 +268,18 @@
 -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)
+ 				    int type, bool init_acl)
  {
-@@ -556,7 +556,7 @@
- 		if (acl) {
- 			umode_t mode = inode->i_mode;
+@@ -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;
-@@ -591,7 +591,7 @@
+@@ -592,7 +592,7 @@
  		value = kmalloc(size, GFP_NOFS);
  		if (!value)
  			return -ENOMEM;
@@ -288,7 +288,7 @@
  		if (err < 0)
  			goto out;
  		flags = 0;
-@@ -612,13 +612,13 @@
+@@ -613,13 +613,13 @@
  /*
   * ntfs_set_acl - inode_operations::set_acl
   */
@@ -296,8 +296,8 @@
 +int ntfs_set_acl(struct inode *inode,
  		 struct posix_acl *acl, int type)
  {
--	return ntfs_set_acl_ex(mnt_userns, inode, acl, type);
-+	return ntfs_set_acl_ex(inode, acl, 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,
@@ -305,7 +305,7 @@
  			      struct inode *inode, int type, void *buffer,
  			      size_t size)
  {
-@@ -630,20 +630,20 @@
+@@ -631,20 +631,20 @@
  		return -EOPNOTSUPP;
  	}
  
@@ -329,7 +329,7 @@
  			      struct inode *inode, int type, const void *value,
  			      size_t size)
  {
-@@ -655,24 +655,24 @@
+@@ -656,24 +656,24 @@
  		return -EOPNOTSUPP;
  	}
  
@@ -358,7 +358,7 @@
  
  release_and_out:
  	posix_acl_release(acl);
-@@ -684,7 +684,7 @@
+@@ -685,7 +685,7 @@
   *
   * Called from ntfs_create_inode().
   */
@@ -367,25 +367,25 @@
  		  struct inode *dir)
  {
  	struct posix_acl *default_acl, *acl;
-@@ -695,7 +695,7 @@
+@@ -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);
+ 				      ACL_TYPE_DEFAULT, true);
  		posix_acl_release(default_acl);
  	} else {
-@@ -706,7 +706,7 @@
+@@ -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);
+ 					      ACL_TYPE_ACCESS, true);
  		posix_acl_release(acl);
  	}
-@@ -718,7 +718,7 @@
+@@ -719,7 +719,7 @@
  /*
   * ntfs_acl_chmod - Helper for ntfs3_setattr().
   */
@@ -394,7 +394,7 @@
  {
  	struct super_block *sb = inode->i_sb;
  
-@@ -728,13 +728,13 @@
+@@ -729,13 +729,13 @@
  	if (S_ISLNK(inode->i_mode))
  		return -EOPNOTSUPP;
  
@@ -410,7 +410,7 @@
  		    int mask)
  {
  	if (ntfs_sb(inode->i_sb)->options->noacsrules) {
-@@ -742,7 +742,7 @@
+@@ -743,7 +743,7 @@
  		return 0;
  	}
  
@@ -419,7 +419,7 @@
  }
  
  /*
-@@ -854,7 +854,7 @@
+@@ -855,7 +855,7 @@
  		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
  		/* TODO: init_user_ns? */
  		err = ntfs_xattr_get_acl(
@@ -428,7 +428,7 @@
  			name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1
  				? ACL_TYPE_ACCESS
  				: ACL_TYPE_DEFAULT,
-@@ -873,7 +873,7 @@
+@@ -874,7 +874,7 @@
   * ntfs_setxattr - inode_operations::setxattr
   */
  static noinline int ntfs_setxattr(const struct xattr_handler *handler,
@@ -437,7 +437,7 @@
  				  struct dentry *de, struct inode *inode,
  				  const char *name, const void *value,
  				  size_t size, int flags)
-@@ -982,7 +982,7 @@
+@@ -983,7 +983,7 @@
  	     !memcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT,
  		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
  		err = ntfs_xattr_set_acl(
diff --git a/kernel-5.14-backport.patch b/kernel-5.14-backport.patch
index 8cf9fa5669f2..a2d303b4cdbd 100644
--- a/kernel-5.14-backport.patch
+++ b/kernel-5.14-backport.patch
@@ -1,6 +1,6 @@
 --- a/file.c
 +++ b/file.c
-@@ -1028,10 +1028,10 @@
+@@ -1034,10 +1034,10 @@
  			size_t cp, tail = PAGE_SIZE - off;
  
  			page = pages[ip];