Update patches

4 files changed, 96 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 30c664d95e81..e9964613e429 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.r0.g8bb7eca
+	pkgver = 5.15.r5.g3a2154b
 	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 = 4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe
+	sha512sums = 3b0126a8f0765ede9c2e3f6e521941fbbef35726e0b6a37edce122181dbef47d9633e2ef06669115d50714193816db8e2ac785fbe3295a62088365abedab49c4
 	sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
-	sha512sums = 3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7
+	sha512sums = c061d3d3b0e531f6d0eba533b884c168a3b057d96d68000cdb9e0fc736538cdc4e7e38d0168f58c3c1b8cb1a7c413f4fb32068847b8c4601dc0406f3fead7533
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 62a72deeb437..9dc249d282ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _base="8bb7eca972ad531c9b149c0a51ab43a417385813"
 _head="master"
 
 pkgname=ntfs3-dkms-git
-pkgver=5.15.r0.g8bb7eca
+pkgver=5.15.r5.g3a2154b
 pkgrel=1
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
@@ -28,9 +28,9 @@ source=(
 sha512sums=(
     '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
     '5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677'
-    '4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe'
+    '3b0126a8f0765ede9c2e3f6e521941fbbef35726e0b6a37edce122181dbef47d9633e2ef06669115d50714193816db8e2ac785fbe3295a62088365abedab49c4'
     '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
-    '3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7'
+    'c061d3d3b0e531f6d0eba533b884c168a3b057d96d68000cdb9e0fc736538cdc4e7e38d0168f58c3c1b8cb1a7c413f4fb32068847b8c4601dc0406f3fead7533'
 )
 
 pkgver() {
diff --git a/kernel-5.12-backport.patch b/kernel-5.12-backport.patch
index f7c4d171b710..7d268f207dcf 100644
--- a/kernel-5.12-backport.patch
+++ b/kernel-5.12-backport.patch
@@ -239,7 +239,7 @@
 
 --- a/xattr.c
 +++ b/xattr.c
-@@ -476,7 +476,7 @@
+@@ -478,7 +478,7 @@
  }
  
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL
@@ -248,7 +248,7 @@
  					 struct inode *inode, int type,
  					 int locked)
  {
-@@ -512,7 +512,7 @@
+@@ -514,7 +514,7 @@
  
  	/* Translate extended attribute to acl. */
  	if (err >= 0) {
@@ -257,7 +257,7 @@
  	} else if (err == -ENODATA) {
  		acl = NULL;
  	} else {
-@@ -533,10 +533,10 @@
+@@ -535,10 +535,10 @@
  struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
  {
  	/* TODO: init_user_ns? */
@@ -270,7 +270,7 @@
  				    struct inode *inode, struct posix_acl *acl,
  				    int type)
  {
-@@ -554,7 +554,7 @@
+@@ -556,7 +556,7 @@
  		if (acl) {
  			umode_t mode = inode->i_mode;
  
@@ -279,7 +279,7 @@
  						    &acl);
  			if (err)
  				goto out;
-@@ -589,7 +589,7 @@
+@@ -591,7 +591,7 @@
  		value = kmalloc(size, GFP_NOFS);
  		if (!value)
  			return -ENOMEM;
@@ -288,7 +288,7 @@
  		if (err < 0)
  			goto out;
  		flags = 0;
-@@ -610,10 +610,10 @@
+@@ -612,13 +612,13 @@
  /*
   * ntfs_set_acl - inode_operations::set_acl
   */
@@ -300,8 +300,65 @@
 +	return ntfs_set_acl_ex(inode, acl, type);
  }
  
- /*
-@@ -621,7 +621,7 @@
+-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)
+ {
+@@ -630,20 +630,20 @@
+ 		return -EOPNOTSUPP;
+ 	}
+ 
+-	acl = ntfs_get_acl(inode, type, false);
++	acl = ntfs_get_acl(inode, type);
+ 	if (IS_ERR(acl))
+ 		return PTR_ERR(acl);
+ 
+ 	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)
+ {
+@@ -655,24 +655,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);
+@@ -684,7 +684,7 @@
   *
   * Called from ntfs_create_inode().
   */
@@ -310,7 +367,7 @@
  		  struct inode *dir)
  {
  	struct posix_acl *default_acl, *acl;
-@@ -632,18 +632,18 @@
+@@ -695,7 +695,7 @@
  		return err;
  
  	if (default_acl) {
@@ -319,10 +376,7 @@
  				      ACL_TYPE_DEFAULT);
  		posix_acl_release(default_acl);
  	} else {
- 		inode->i_default_acl = NULL;
- 	}
- 
- 	if (!acl)
+@@ -706,7 +706,7 @@
  		inode->i_acl = NULL;
  	else {
  		if (!err)
@@ -331,7 +385,7 @@
  					      ACL_TYPE_ACCESS);
  		posix_acl_release(acl);
  	}
-@@ -655,7 +655,7 @@
+@@ -718,7 +718,7 @@
  /*
   * ntfs_acl_chmod - Helper for ntfs3_setattr().
   */
@@ -340,7 +394,7 @@
  {
  	struct super_block *sb = inode->i_sb;
  
-@@ -665,7 +665,7 @@
+@@ -728,13 +728,13 @@
  	if (S_ISLNK(inode->i_mode))
  		return -EOPNOTSUPP;
  
@@ -349,8 +403,6 @@
  }
  
  /*
-@@ -671,7 +671,7 @@
- /*
   * ntfs_permission - inode_operations::permission
   */
 -int ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
@@ -358,7 +410,7 @@
  		    int mask)
  {
  	if (ntfs_sb(inode->i_sb)->options->noacsrules) {
-@@ -679,7 +679,7 @@
+@@ -742,7 +742,7 @@
  		return 0;
  	}
  
@@ -367,7 +419,16 @@
  }
  
  /*
-@@ -793,7 +793,7 @@
+@@ -854,7 +854,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,
+@@ -873,7 +873,7 @@
   * ntfs_setxattr - inode_operations::setxattr
   */
  static noinline int ntfs_setxattr(const struct xattr_handler *handler,
@@ -376,3 +437,12 @@
  				  struct dentry *de, struct inode *inode,
  				  const char *name, const void *value,
  				  size_t size, int flags)
+@@ -982,7 +982,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.15-backport.patch b/kernel-5.15-backport.patch
index 3e4e013af2fa..d7c757328273 100644
--- a/kernel-5.15-backport.patch
+++ b/kernel-5.15-backport.patch
@@ -12,7 +12,7 @@
 
 --- a/xattr.c
 +++ b/xattr.c
-@@ -530,11 +530,8 @@
+@@ -532,11 +532,8 @@
  /*
   * ntfs_get_acl - inode_operations::get_acl
   */