Adapt the package for 5.16

4 files changed, 28 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c5086e1c3d30..7272561bfbf0 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 = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/Paragon-Software-Group/linux-ntfs3
 	arch = any
@@ -18,10 +18,12 @@ pkgbase = ntfs3-dkms-git
 	source = kernel-5.12-backport.patch
 	source = kernel-5.14-backport.patch
 	source = kernel-5.15-backport.patch
+	source = kernel-5.16.patch
 	sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
-	sha512sums = 5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677
+	sha512sums = a0f0cd8901008759dc32f82d8ed758c3ba044bc1e0514b7cdf28aedde3ec369afb76c21381e4e36d4b6ff251116fec69521a0ef0279f8f1ef4cfebf3e87f6594
 	sha512sums = bed04edd0de7fd1f5675689e24b77f7d7a1b6eb8075c0fb20fa7ac8f2ca569aa3ea1685ddde5f1800958e21be96b8afaae68f49d7855b97915eb1c9c3352a66e
 	sha512sums = 1644192df72ce80d0244e21b2c429785106b0bba179a06c5babd92b6d1b09ad28771eeb63f953ecb65ed616ab2d6b1744f1465c905ae8080c6b01c8d7e164005
 	sha512sums = 45b44d0d235e1fe0853c2b095843ec5d795dacc8437585d84250b7be4793aeb538152f032fc998d7073e62b11251d9f345679f912a6cb54b87b56aa85173dc22
+	sha512sums = 5a61d737040bbb767d1e047519149e79f411c680552192cc3f0d1538726e853573a8c1c7211e585bfb2fd6a75b6f942ebd6bb71c17d207cf4e89d484bf0f36bf
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 58fbddb88807..bc5e95fca80e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=ntfs3-dkms-git
 pkgver=5.15.r9.g52e00ea
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
 arch=('any')
@@ -19,14 +19,16 @@ source=(
     "kernel-5.12-backport.patch"
     "kernel-5.14-backport.patch"
     "kernel-5.15-backport.patch"
+    "kernel-5.16.patch"
 )
 
 sha512sums=(
     '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
-    '5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677'
+    'a0f0cd8901008759dc32f82d8ed758c3ba044bc1e0514b7cdf28aedde3ec369afb76c21381e4e36d4b6ff251116fec69521a0ef0279f8f1ef4cfebf3e87f6594'
     'bed04edd0de7fd1f5675689e24b77f7d7a1b6eb8075c0fb20fa7ac8f2ca569aa3ea1685ddde5f1800958e21be96b8afaae68f49d7855b97915eb1c9c3352a66e'
     '1644192df72ce80d0244e21b2c429785106b0bba179a06c5babd92b6d1b09ad28771eeb63f953ecb65ed616ab2d6b1744f1465c905ae8080c6b01c8d7e164005'
     '45b44d0d235e1fe0853c2b095843ec5d795dacc8437585d84250b7be4793aeb538152f032fc998d7073e62b11251d9f345679f912a6cb54b87b56aa85173dc22'
+    '5a61d737040bbb767d1e047519149e79f411c680552192cc3f0d1538726e853573a8c1c7211e585bfb2fd6a75b6f942ebd6bb71c17d207cf4e89d484bf0f36bf'
 )
 
 _ver="5.15"
@@ -76,6 +78,7 @@ package() {
     patch -p0 -N -i "${srcdir}/Makefile.patch"
 
     # For testing
+    # patch -p1 -N -i "${srcdir}/kernel-5.16.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.15-backport.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.14-backport.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.12-backport.patch"
diff --git a/dkms.conf b/dkms.conf
index 2d1e87dac8d3..ef4a7cf8af7f 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -4,9 +4,11 @@ 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"
-PATCH[0]="kernel-5.15-backport.patch"
-PATCH_MATCH[0]="^([0-4]\.|5\.[0-9]\.|5\.1[0-4]\.).*"
-PATCH[1]="kernel-5.14-backport.patch"
-PATCH_MATCH[1]="^([0-4]\.|5\.[0-9]\.|5\.1[0-3]\.).*"
-PATCH[2]="kernel-5.12-backport.patch"
-PATCH_MATCH[2]="^([0-4]\.|5\.[0-9]\.|5\.1[0-1]\.).*"
+PATCH[0]="kernel-5.16.patch"
+PATCH_MATCH[0]="^(5\.16\.).*"
+PATCH[1]="kernel-5.15-backport.patch"
+PATCH_MATCH[1]="^([0-4]\.|5\.[0-9]\.|5\.1[0-4]\.).*"
+PATCH[2]="kernel-5.14-backport.patch"
+PATCH_MATCH[2]="^([0-4]\.|5\.[0-9]\.|5\.1[0-3]\.).*"
+PATCH[3]="kernel-5.12-backport.patch"
+PATCH_MATCH[3]="^([0-4]\.|5\.[0-9]\.|5\.1[0-1]\.).*"
diff --git a/kernel-5.16.patch b/kernel-5.16.patch
new file mode 100644
index 000000000000..8b257e045c6c
--- /dev/null
+++ b/kernel-5.16.patch
@@ -0,0 +1,11 @@
+--- 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;
+ 		}