v21 update

author: Hanabishi 2021-02-13 00:35:17 +0500
committer: Hanabishi 2021-02-13 00:35:17 +0500
commit: 4f002f03286c78ac462527b0ca0465ff19560249 (patch)
tree: eff1de2c7427a1c9413c02662003757ab779d81d
parent: 42ac9cfa73d11c0f35ce552100141eca53cbadf8 (diff)
download: aur-4f002f03286c78ac462527b0ca0465ff19560249.tar.gz
5 files changed, 90 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f810cec4d790..b6221bc5c10d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ntfs3-dkms
 	pkgdesc = NTFS read-write driver GPL implementation by Paragon Software. Current version works with NTFS (including v3.1), normal/compressed/sparse files and supports journal replaying.
-	pkgver = 20.0.0
+	pkgver = 21.0.0
 	pkgrel = 1
 	url = https://www.paragon-software.com/home/ntfs3-driver-faq/
 	arch = any
@@ -9,26 +9,26 @@ pkgbase = ntfs3-dkms
 	options = !strip
 	source = Makefile.patch
 	source = dkms.conf
-	source = v20.0.0~1.patch::https://lore.kernel.org/lkml/20210205150244.542628-2-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~2.patch::https://lore.kernel.org/lkml/20210205150244.542628-3-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~3.patch::https://lore.kernel.org/lkml/20210205150244.542628-4-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~4.patch::https://lore.kernel.org/lkml/20210205150244.542628-5-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~5.patch::https://lore.kernel.org/lkml/20210205150244.542628-6-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~6.patch::https://lore.kernel.org/lkml/20210205150244.542628-7-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~7.patch::https://lore.kernel.org/lkml/20210205150244.542628-8-almaz.alexandrovich@paragon-software.com/raw
-	source = v20.0.0~8.patch::https://lore.kernel.org/lkml/20210205150244.542628-9-almaz.alexandrovich@paragon-software.com/raw
-	source = v20_fix.patch
+	source = v21.0.0~1.patch::https://lore.kernel.org/lkml/20210212162416.2756937-2-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~2.patch::https://lore.kernel.org/lkml/20210212162416.2756937-3-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~3.patch::https://lore.kernel.org/lkml/20210212162416.2756937-4-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~4.patch::https://lore.kernel.org/lkml/20210212162416.2756937-5-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~5.patch::https://lore.kernel.org/lkml/20210212162416.2756937-6-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~6.patch::https://lore.kernel.org/lkml/20210212162416.2756937-7-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~7.patch::https://lore.kernel.org/lkml/20210212162416.2756937-8-almaz.alexandrovich@paragon-software.com/raw
+	source = v21.0.0~8.patch::https://lore.kernel.org/lkml/20210212162416.2756937-9-almaz.alexandrovich@paragon-software.com/raw
+	source = kernel_version_fix.patch
 	sha512sums = 55523ce0d3c3790c33fbe73bd396e5e5f1d015608303e497202a232f51af9bb172003cc836880a7fa85163947609281754606067e5e0df79e9630cd6d1821b96
-	sha512sums = 88e9cf87ab809df7753012b0e285beaa902930a02c4140573967289ea34ae5603159a116cafd5a6bda2e29987d146ed32dc19d831ba44b1db8ca23fc2f3d8f12
-	sha512sums = 3abe2a46b4099e50664914a1f743594c1e591a903ed21bd988e615de0a458d53abfb4d4f49064b7838f75f3e335594f5771f79779a0e656855463eb8d434845b
-	sha512sums = 96a05006a7bded3e1ba122c8a4916eb0326d83d6820642f433676fc08063340d9799d69b71a20717bb5032750b909c7e2ad9468a09b85aea8774f3f493a1fdc5
-	sha512sums = 862a8ed7e7c68027eff42d40b4698a3f984e5f5d90a70623b2e83488dc37bb90c38babfe108a73d46baea2b0a7cc63a643d60f48d1b48afa17aaaaa9ddef5a75
-	sha512sums = 725bb2673d1a61463aff61cc1d8fcaac3888b3177e7af75bed464974da0cfa07383628ce863bb214e9c48969f0d978cbbd845dcfbc971ef850f08af3eb3eb740
-	sha512sums = d2366ffa6108c78a4579a8dbc55cea27006fcdb0a8c60638b7e0d4b78067f4b1450c69030dfdf6daf077b3e827bf052f0fc63aa02a963cd1e6b9914972abe143
-	sha512sums = eb420dc335e8b522bfcf037c4eb608da254e570d4d41ea6b688eed6b7ff4e4df560d573d31c51b587139dd82f0b9bce538a964ee6e3431aea78e2b5beb9d03fc
-	sha512sums = 0b4d47b79c6884f657b974700e4709f9527bfdd60b931e10b3402fcea514107a82fcfe81c1a0dcb7e64247b3661ecaa1868e4c1fe1c7f0f0564d591d612085f4
-	sha512sums = fae49f1a1ae6bcdb56337f43b78467c282a4a7405be75821b8ac41740595cf4b1af091cae59ba26aa6118448d6710494aca7d13a31260316042e49c693e687c3
-	sha512sums = a799437ebe798fa88d667ddb086f4c752a41cac7aa5e70bd5f1d718c923272eaff7b59deaeac6794f801dc99bcb4f1c6bacbc8e59539c1e7e8180acf4f0a43dd
+	sha512sums = 6954d129fc1ed01fea288c65d41bcac4caac537d3632aa323b531e095b673428ae38bb480b68ef05b5b2a3333678a61a982a54d40e9ce1d2ca48985a29557f1c
+	sha512sums = 01ca8bd32d3f3a740f2ec8d83ae14c0e1cda2bdde054a62b9382715a95c0ea37516ee92c448db039b0c6209e142bfecdba6cb3025cd3eaf9375349396ddeed83
+	sha512sums = 6361f3ada2f977859ec79ded80438476c6f74ebef2f22760ab81bd97f183888f270b235d1afbcef8c41a55de261cbbb5030be49aedad90920037a3a370072e21
+	sha512sums = a681cf4b0ec10aa4b8d59824d179de697b6e24403b72022a352f6f4bb85441c60a23c34d2a8c437952ebc2d155fa0862f75e933bf3ae2c000bc0c2b8f5d22b6a
+	sha512sums = cbb32352ee33f687b2c88b83243ea36bfe9387ebba13173412ddb53531c4b7b18be8668108e51cf10ff36cec16a36cf497d6d2957208b95d6ea7bd36c0670008
+	sha512sums = f7646039872ade9cde19fb9be74c4fe8b676ab8fd0bb83c50737afae73c48424fc4fcaa94168b19127a2710dca94ad14969d0f4c57b08d1fd434195439da8912
+	sha512sums = 9715dbf4c294bd59f666a8dcae330407e7da7329c6b5b15781b5ee6401ee6cbbc54a0accda93d819c0007a7df27721d3a7ae8c77b9def8d4959f0fef97b663a5
+	sha512sums = 11f108c0d1f91cdbf100e9f572132a3e0ca9ff2e3f131f82a053e20b20e430cb38e09a8ed385404dbe66c46fa1c930c68eba3d805f864fa66f60985d79d98176
+	sha512sums = 525d4ef57365f5a813fa9e17c8f62b3b664def6c1db94c4d88bf8c35504743823c29db003146204d6ca9401ef1360cadc8cb40373828a3c85461790d3ea2dc0c
+	sha512sums = 12e2df3b2646371852c7370726b2635d023385edeeb4fdd4e8d0585f88388d4b9041bf30e8ae1c9fb5fc84e032a5f553576b8ed21d5612ed204b7dec2174010f
 
 pkgname = ntfs3-dkms
 
diff --git a/.gitignore b/.gitignore
index 0eff51af59cb..876aec7981f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ pkg/
 src/
 *.patch
 !Makefile.patch
-!v20_fix.patch
+!kernel_version_fix.patch
 *.pkg.tar.*
 \ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index fd8945cb6d7b..5b3e2d7871de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=ntfs3-dkms
-pkgver=20.0.0
+pkgver=21.0.0
 pkgrel=1
 pkgdesc="NTFS read-write driver GPL implementation by Paragon Software. Current version works with NTFS (including v3.1), normal/compressed/sparse files and supports journal replaying."
 arch=('any')
@@ -9,26 +9,26 @@ depends=('dkms')
 options=('!strip')
 source=(Makefile.patch
         dkms.conf
-        "v$pkgver~1.patch::https://lore.kernel.org/lkml/20210205150244.542628-2-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~2.patch::https://lore.kernel.org/lkml/20210205150244.542628-3-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~3.patch::https://lore.kernel.org/lkml/20210205150244.542628-4-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~4.patch::https://lore.kernel.org/lkml/20210205150244.542628-5-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~5.patch::https://lore.kernel.org/lkml/20210205150244.542628-6-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~6.patch::https://lore.kernel.org/lkml/20210205150244.542628-7-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~7.patch::https://lore.kernel.org/lkml/20210205150244.542628-8-almaz.alexandrovich@paragon-software.com/raw"
-        "v$pkgver~8.patch::https://lore.kernel.org/lkml/20210205150244.542628-9-almaz.alexandrovich@paragon-software.com/raw"
-        v20_fix.patch)
+        "v$pkgver~1.patch::https://lore.kernel.org/lkml/20210212162416.2756937-2-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~2.patch::https://lore.kernel.org/lkml/20210212162416.2756937-3-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~3.patch::https://lore.kernel.org/lkml/20210212162416.2756937-4-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~4.patch::https://lore.kernel.org/lkml/20210212162416.2756937-5-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~5.patch::https://lore.kernel.org/lkml/20210212162416.2756937-6-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~6.patch::https://lore.kernel.org/lkml/20210212162416.2756937-7-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~7.patch::https://lore.kernel.org/lkml/20210212162416.2756937-8-almaz.alexandrovich@paragon-software.com/raw"
+        "v$pkgver~8.patch::https://lore.kernel.org/lkml/20210212162416.2756937-9-almaz.alexandrovich@paragon-software.com/raw"
+        kernel_version_fix.patch)
 sha512sums=('55523ce0d3c3790c33fbe73bd396e5e5f1d015608303e497202a232f51af9bb172003cc836880a7fa85163947609281754606067e5e0df79e9630cd6d1821b96'
-            '88e9cf87ab809df7753012b0e285beaa902930a02c4140573967289ea34ae5603159a116cafd5a6bda2e29987d146ed32dc19d831ba44b1db8ca23fc2f3d8f12'
-            '3abe2a46b4099e50664914a1f743594c1e591a903ed21bd988e615de0a458d53abfb4d4f49064b7838f75f3e335594f5771f79779a0e656855463eb8d434845b'
-            '96a05006a7bded3e1ba122c8a4916eb0326d83d6820642f433676fc08063340d9799d69b71a20717bb5032750b909c7e2ad9468a09b85aea8774f3f493a1fdc5'
-            '862a8ed7e7c68027eff42d40b4698a3f984e5f5d90a70623b2e83488dc37bb90c38babfe108a73d46baea2b0a7cc63a643d60f48d1b48afa17aaaaa9ddef5a75'
-            '725bb2673d1a61463aff61cc1d8fcaac3888b3177e7af75bed464974da0cfa07383628ce863bb214e9c48969f0d978cbbd845dcfbc971ef850f08af3eb3eb740'
-            'd2366ffa6108c78a4579a8dbc55cea27006fcdb0a8c60638b7e0d4b78067f4b1450c69030dfdf6daf077b3e827bf052f0fc63aa02a963cd1e6b9914972abe143'
-            'eb420dc335e8b522bfcf037c4eb608da254e570d4d41ea6b688eed6b7ff4e4df560d573d31c51b587139dd82f0b9bce538a964ee6e3431aea78e2b5beb9d03fc'
-            '0b4d47b79c6884f657b974700e4709f9527bfdd60b931e10b3402fcea514107a82fcfe81c1a0dcb7e64247b3661ecaa1868e4c1fe1c7f0f0564d591d612085f4'
-            'fae49f1a1ae6bcdb56337f43b78467c282a4a7405be75821b8ac41740595cf4b1af091cae59ba26aa6118448d6710494aca7d13a31260316042e49c693e687c3'
-            'a799437ebe798fa88d667ddb086f4c752a41cac7aa5e70bd5f1d718c923272eaff7b59deaeac6794f801dc99bcb4f1c6bacbc8e59539c1e7e8180acf4f0a43dd')
+            '6954d129fc1ed01fea288c65d41bcac4caac537d3632aa323b531e095b673428ae38bb480b68ef05b5b2a3333678a61a982a54d40e9ce1d2ca48985a29557f1c'
+            '01ca8bd32d3f3a740f2ec8d83ae14c0e1cda2bdde054a62b9382715a95c0ea37516ee92c448db039b0c6209e142bfecdba6cb3025cd3eaf9375349396ddeed83'
+            '6361f3ada2f977859ec79ded80438476c6f74ebef2f22760ab81bd97f183888f270b235d1afbcef8c41a55de261cbbb5030be49aedad90920037a3a370072e21'
+            'a681cf4b0ec10aa4b8d59824d179de697b6e24403b72022a352f6f4bb85441c60a23c34d2a8c437952ebc2d155fa0862f75e933bf3ae2c000bc0c2b8f5d22b6a'
+            'cbb32352ee33f687b2c88b83243ea36bfe9387ebba13173412ddb53531c4b7b18be8668108e51cf10ff36cec16a36cf497d6d2957208b95d6ea7bd36c0670008'
+            'f7646039872ade9cde19fb9be74c4fe8b676ab8fd0bb83c50737afae73c48424fc4fcaa94168b19127a2710dca94ad14969d0f4c57b08d1fd434195439da8912'
+            '9715dbf4c294bd59f666a8dcae330407e7da7329c6b5b15781b5ee6401ee6cbbc54a0accda93d819c0007a7df27721d3a7ae8c77b9def8d4959f0fef97b663a5'
+            '11f108c0d1f91cdbf100e9f572132a3e0ca9ff2e3f131f82a053e20b20e430cb38e09a8ed385404dbe66c46fa1c930c68eba3d805f864fa66f60985d79d98176'
+            '525d4ef57365f5a813fa9e17c8f62b3b664def6c1db94c4d88bf8c35504743823c29db003146204d6ca9401ef1360cadc8cb40373828a3c85461790d3ea2dc0c'
+            '12e2df3b2646371852c7370726b2635d023385edeeb4fdd4e8d0585f88388d4b9041bf30e8ae1c9fb5fc84e032a5f553576b8ed21d5612ed204b7dec2174010f')
 
 
 prepare() {
@@ -38,7 +38,7 @@ prepare() {
   do
     patch -p3 -N -i "$patch"
   done
-  patch -p3 -N -i "$srcdir/v20_fix.patch"
+  patch -p3 -N -i "$srcdir/kernel_version_fix.patch"
   patch -p0 -N -i "$srcdir/Makefile.patch"
 }
 
diff --git a/dkms.conf b/dkms.conf
index 5fa65048dd92..6f684f363b90 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="ntfs3"
-PACKAGE_VERSION="20.0.0"
+PACKAGE_VERSION="21.0.0"
 BUILT_MODULE_NAME[0]="ntfs3"
 DEST_MODULE_LOCATION[0]="/kernel/fs/ntfs3"
 AUTOINSTALL="yes"
diff --git a/v20_fix.patch b/kernel_version_fix.patch
index 0ac14fc06acf..dbef084ed18f 100644
--- a/v20_fix.patch
+++ b/kernel_version_fix.patch
@@ -1,5 +1,20 @@
+From e487427ef07c735fdc711a56d1ceac6629c34dcf Mon Sep 17 00:00:00 2001
+From: Oleksandr Natalenko <oleksandr@natalenko.name>
+Date: Fri, 12 Feb 2021 20:11:54 +0100
+Subject: [PATCH] ntfs3-5.11: throw away userns changes from linux-next
+
+Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
+---
+ fs/ntfs3/file.c    | 15 ++++++------
+ fs/ntfs3/inode.c   | 10 ++++----
+ fs/ntfs3/namei.c   | 34 ++++++++++++--------------
+ fs/ntfs3/ntfs_fs.h | 26 +++++++++-----------
+ fs/ntfs3/super.c   |  5 ++--
+ fs/ntfs3/xattr.c   | 61 ++++++++++++++++++----------------------------
+ 6 files changed, 65 insertions(+), 86 deletions(-)
+
 diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
-index 5ce203212c8c..04caa200a37f 100644
+index d5bbe06ddb0d..3886a4a27fa5 100644
 --- a/fs/ntfs3/file.c
 +++ b/fs/ntfs3/file.c
 @@ -76,8 +76,8 @@ static long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)
@@ -22,7 +37,7 @@ index 5ce203212c8c..04caa200a37f 100644
  
  	stat->result_mask |= STATX_BTIME;
  	stat->btime = ni->i_crtime;
-@@ -617,8 +617,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
+@@ -614,8 +614,7 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len)
  /*
   * inode_operations::setattr
   */
@@ -32,7 +47,7 @@ index 5ce203212c8c..04caa200a37f 100644
  {
  	struct super_block *sb = dentry->d_sb;
  	struct ntfs_sb_info *sbi = sb->s_fs_info;
-@@ -636,7 +635,7 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+@@ -633,7 +632,7 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
  		ia_valid = attr->ia_valid;
  	}
  
@@ -41,7 +56,7 @@ index 5ce203212c8c..04caa200a37f 100644
  	if (err)
  		goto out;
  
-@@ -661,10 +660,10 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
+@@ -658,10 +657,10 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
  		ni->ni_flags |= NI_FLAG_UPDATE_PARENT;
  	}
  
@@ -55,10 +70,10 @@ index 5ce203212c8c..04caa200a37f 100644
  			goto out;
  
 diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
-index bf400a2af0cd..9b07738d48a1 100644
+index 1ab2e500b8b0..504d783f6ff9 100644
 --- a/fs/ntfs3/inode.c
 +++ b/fs/ntfs3/inode.c
-@@ -1175,10 +1175,10 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,
+@@ -1176,10 +1176,10 @@ ntfs_create_reparse_buffer(struct ntfs_sb_info *sbi, const char *symname,
  	return ERR_PTR(err);
  }
  
@@ -73,7 +88,7 @@ index bf400a2af0cd..9b07738d48a1 100644
  {
  	int err;
  	struct super_block *sb = dir->i_sb;
-@@ -1584,7 +1584,7 @@ int ntfs_create_inode(struct user_namespace *mnt_userns, struct inode *dir,
+@@ -1585,7 +1585,7 @@ int ntfs_create_inode(struct user_namespace *mnt_userns, struct inode *dir,
  
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL
  	if (!is_link && (sb->s_flags & SB_POSIXACL)) {
@@ -83,7 +98,7 @@ index bf400a2af0cd..9b07738d48a1 100644
  			goto out6;
  	} else
 diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
-index f943b354b08e..e53cfc0f123d 100644
+index 5e3b928984fe..34d89ec2a303 100644
 --- a/fs/ntfs3/namei.c
 +++ b/fs/ntfs3/namei.c
 @@ -102,8 +102,8 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,
@@ -177,10 +192,10 @@ index f943b354b08e..e53cfc0f123d 100644
  		err = finish_open(file, dentry, ntfs_file_open);
  	dput(d);
 diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h
-index 49c1a1ea7e39..c6a42de17d33 100644
+index 25069b8c46e5..6e5afe3dc943 100644
 --- a/fs/ntfs3/ntfs_fs.h
 +++ b/fs/ntfs3/ntfs_fs.h
-@@ -453,12 +453,11 @@ bool dir_is_empty(struct inode *dir);
+@@ -454,12 +454,11 @@ bool dir_is_empty(struct inode *dir);
  extern const struct file_operations ntfs_dir_operations;
  
  /* globals from file.c*/
@@ -196,7 +211,7 @@ index 49c1a1ea7e39..c6a42de17d33 100644
  int ntfs_file_open(struct inode *inode, struct file *file);
  int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
  		__u64 start, __u64 len);
-@@ -644,10 +643,10 @@ int ntfs_sync_inode(struct inode *inode);
+@@ -645,10 +644,10 @@ int ntfs_sync_inode(struct inode *inode);
  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);
@@ -211,7 +226,7 @@ index 49c1a1ea7e39..c6a42de17d33 100644
  int ntfs_link_inode(struct inode *inode, struct dentry *dentry);
  int ntfs_unlink_inode(struct inode *dir, const struct dentry *dentry);
  void ntfs_evict_inode(struct inode *inode);
-@@ -770,18 +769,15 @@ int ntfs_cmp_names_cpu(const struct cpu_str *uni1, const struct le_str *uni2,
+@@ -771,18 +770,15 @@ int ntfs_cmp_names_cpu(const struct cpu_str *uni1, const struct le_str *uni2,
  /* globals from xattr.c */
  #ifdef CONFIG_NTFS3_FS_POSIX_ACL
  struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
@@ -235,7 +250,7 @@ index 49c1a1ea7e39..c6a42de17d33 100644
  extern const struct xattr_handler *ntfs_xattr_handlers[];
  
 diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
-index cf09da61d4bd..f7bc59f72a0b 100644
+index 7d09d3eaaf2a..69c8a7d33f9d 100644
 --- a/fs/ntfs3/super.c
 +++ b/fs/ntfs3/super.c
 @@ -544,14 +544,13 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)
@@ -256,10 +271,10 @@ index cf09da61d4bd..f7bc59f72a0b 100644
  		seq_printf(m, ",fmask=%04o", ~opts->fs_fmask_inv);
  	if (opts->dmask)
 diff --git a/fs/ntfs3/xattr.c b/fs/ntfs3/xattr.c
-index 41d01674fbff..3b9946ea0220 100644
+index ffe329315b12..f94f215c1078 100644
 --- a/fs/ntfs3/xattr.c
 +++ b/fs/ntfs3/xattr.c
-@@ -479,8 +479,7 @@ static inline void ntfs_posix_acl_release(struct posix_acl *acl)
+@@ -473,8 +473,7 @@ static inline void ntfs_posix_acl_release(struct posix_acl *acl)
  		kfree(acl);
  }
  
@@ -293,7 +308,7 @@ index 41d01674fbff..3b9946ea0220 100644
  				    int type, int locked)
  {
  	const char *name;
-@@ -588,7 +585,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
+@@ -590,7 +587,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
  	if (!value)
  		return -ENOMEM;
  
@@ -302,7 +317,7 @@ index 41d01674fbff..3b9946ea0220 100644
  	if (err)
  		goto out;
  
-@@ -612,14 +609,12 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
+@@ -614,14 +611,12 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,
   *
   * inode_operations::set_acl
   */
@@ -319,8 +334,8 @@ index 41d01674fbff..3b9946ea0220 100644
 +static int ntfs_xattr_get_acl(struct inode *inode, int type, void *buffer,
  			      size_t size)
  {
- 	struct super_block *sb = inode->i_sb;
-@@ -636,14 +631,13 @@ static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns,
+ 	struct posix_acl *acl;
+@@ -637,14 +632,13 @@ static int ntfs_xattr_get_acl(struct user_namespace *mnt_userns,
  	if (!acl)
  		return -ENODATA;
  
@@ -336,9 +351,9 @@ index 41d01674fbff..3b9946ea0220 100644
 +static int ntfs_xattr_set_acl(struct inode *inode, int type, const void *value,
  			      size_t size)
  {
- 	struct super_block *sb = inode->i_sb;
-@@ -653,13 +647,13 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns,
- 	if (!(sb->s_flags & SB_POSIXACL))
+ 	struct posix_acl *acl;
+@@ -653,23 +647,23 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns,
+ 	if (!(inode->i_sb->s_flags & SB_POSIXACL))
  		return -EOPNOTSUPP;
  
 -	if (!inode_owner_or_capable(mnt_userns, inode))
@@ -353,7 +368,10 @@ index 41d01674fbff..3b9946ea0220 100644
  	if (IS_ERR(acl))
  		return PTR_ERR(acl);
  
-@@ -669,7 +663,7 @@ static int ntfs_xattr_set_acl(struct user_namespace *mnt_userns,
+ 	if (acl) {
+-		err = posix_acl_valid(mnt_userns, acl);
++		err = posix_acl_valid(&init_user_ns, acl);
+ 		if (err)
  			goto release_and_out;
  	}
  
@@ -434,7 +452,7 @@ index 41d01674fbff..3b9946ea0220 100644
  }
  
  /*
-@@ -900,9 +890,8 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,
+@@ -884,9 +874,8 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,
  	    (name_len == sizeof(XATTR_NAME_POSIX_ACL_DEFAULT) - 1 &&
  	     !memcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT,
  		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
@@ -445,7 +463,7 @@ index 41d01674fbff..3b9946ea0220 100644
  			name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1 ?
  				ACL_TYPE_ACCESS :
  				ACL_TYPE_DEFAULT,
-@@ -923,7 +912,6 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,
+@@ -907,7 +896,6 @@ static int ntfs_getxattr(const struct xattr_handler *handler, struct dentry *de,
   * inode_operations::setxattr
   */
  static noinline int ntfs_setxattr(const struct xattr_handler *handler,
@@ -453,7 +471,7 @@ index 41d01674fbff..3b9946ea0220 100644
  				  struct dentry *de, struct inode *inode,
  				  const char *name, const void *value,
  				  size_t size, int flags)
-@@ -1050,9 +1038,8 @@ static noinline int ntfs_setxattr(const struct xattr_handler *handler,
+@@ -1015,9 +1003,8 @@ static noinline int ntfs_setxattr(const struct xattr_handler *handler,
  	    (name_len == sizeof(XATTR_NAME_POSIX_ACL_DEFAULT) - 1 &&
  	     !memcmp(name, XATTR_NAME_POSIX_ACL_DEFAULT,
  		     sizeof(XATTR_NAME_POSIX_ACL_DEFAULT)))) {
@@ -464,3 +482,6 @@ index 41d01674fbff..3b9946ea0220 100644
  			name_len == sizeof(XATTR_NAME_POSIX_ACL_ACCESS) - 1 ?
  				ACL_TYPE_ACCESS :
  				ACL_TYPE_DEFAULT,
+-- 
+GitLab
+
author	Hanabishi	2021-02-13 00:35:17 +0500
committer	Hanabishi	2021-02-13 00:35:17 +0500
commit	4f002f03286c78ac462527b0ca0465ff19560249 (patch)
tree	eff1de2c7427a1c9413c02662003757ab779d81d
parent	42ac9cfa73d11c0f35ce552100141eca53cbadf8 (diff)
download	aur-4f002f03286c78ac462527b0ca0465ff19560249.tar.gz