Update to 5.16

4 files changed, 58 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6b509be8fef..5610c890cdd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ntfs3-dkms
 	pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
-	pkgver = 5.15
-	pkgrel = 4
+	pkgver = 5.16
+	pkgrel = 1
 	epoch = 1
 	url = https://www.kernel.org/doc/html/latest/filesystems/ntfs3.html
 	arch = any
@@ -10,20 +10,22 @@ pkgbase = ntfs3-dkms
 	provides = NTFS3-MODULE
 	provides = ntfs3
 	conflicts = ntfs3
-	noextract = linux-5.15.tar.gz
+	noextract = linux-5.16.tar.gz
 	options = !strip
 	options = !emptydirs
-	source = linux-5.15.tar.gz::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.15.tar.gz
+	source = linux-5.16.tar.gz::https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/snapshot/linux-5.16.tar.gz
 	source = Makefile.patch
 	source = dkms.conf
 	source = kernel-5.12-backport.patch
 	source = kernel-5.14-backport.patch
 	source = kernel-5.15-backport.patch
-	sha512sums = f31ff70afa2c0b5a83f04d862187570174e477b92ac5d503f9fb1d1617a0e16d863b786495c321e41528c4a67ab050a5320b1d875555405a1e6e1f7a3c3b6cc4
+	source = kernel-5.16-backport.patch
+	sha512sums = e7e2e3208e681eef8557138763e7460418264d8fbad3dbb965cf7d40e9d55800419199de78774458775ca593f550f6b50e7e3bc8fad75edd085d08d1c5933b40
 	sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
-	sha512sums = 5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677
+	sha512sums = a46d538f3d166741dafcbc880f6322932478170aa0edf17b57a4e9f1543bea4c75970f08b39d67a14d48b63ac7a1c18f3a30fe763660b39ed404933eb0e37308
 	sha512sums = 4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe
 	sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
 	sha512sums = 3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7
+	sha512sums = d13e320a127bb3c8988d040d6c27b98981ca4352fb29ca57e5afa9b549f271c33a668beaefd142ca21f8930371aec5aedaaf1d07c157abb05c30f4899b643cdf
 
 pkgname = ntfs3-dkms
diff --git a/PKGBUILD b/PKGBUILD
index e0d3f837b1fd..2029515550c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=ntfs3-dkms
-pkgver=5.15
-pkgrel=4
+pkgver=5.16
+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')
@@ -21,15 +21,17 @@ source=(
     "kernel-5.12-backport.patch"
     "kernel-5.14-backport.patch"
     "kernel-5.15-backport.patch"
+    "kernel-5.16-backport.patch"
 )
 
 sha512sums=(
-    'f31ff70afa2c0b5a83f04d862187570174e477b92ac5d503f9fb1d1617a0e16d863b786495c321e41528c4a67ab050a5320b1d875555405a1e6e1f7a3c3b6cc4'
+    'e7e2e3208e681eef8557138763e7460418264d8fbad3dbb965cf7d40e9d55800419199de78774458775ca593f550f6b50e7e3bc8fad75edd085d08d1c5933b40'
     '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
-    '5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677'
+    'a46d538f3d166741dafcbc880f6322932478170aa0edf17b57a4e9f1543bea4c75970f08b39d67a14d48b63ac7a1c18f3a30fe763660b39ed404933eb0e37308'
     '4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe'
     '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
     '3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7'
+    'd13e320a127bb3c8988d040d6c27b98981ca4352fb29ca57e5afa9b549f271c33a668beaefd142ca21f8930371aec5aedaaf1d07c157abb05c30f4899b643cdf'
 )
 
 noextract=("${_archive}")
@@ -53,6 +55,7 @@ package() {
     patch -p0 -N -i "${srcdir}/Makefile.patch"
 
     # For testing
+    # patch -p1 -N -i "${srcdir}/kernel-5.16-backport.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..b8492a43f6a5 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,12 +1,14 @@
 PACKAGE_NAME="ntfs3"
-PACKAGE_VERSION="5.15"
+PACKAGE_VERSION="5.16"
 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-backport.patch"
+PATCH_MATCH[0]="^([0-4]\.|5\.[0-9]\.|5\.1[0-5]\.).*"
+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-backport.patch b/kernel-5.16-backport.patch
new file mode 100644
index 000000000000..c64bde71662a
--- /dev/null
+++ b/kernel-5.16-backport.patch
@@ -0,0 +1,34 @@
+--- a/file.c
++++ b/file.c
+@@ -990,7 +990,7 @@
+ 		frame_vbo = pos & ~(frame_size - 1);
+ 		index = frame_vbo >> PAGE_SHIFT;
+ 
+-		if (unlikely(fault_in_iov_iter_readable(from, bytes))) {
++		if (unlikely(iov_iter_fault_in_readable(from, bytes))) {
+ 			err = -EFAULT;
+ 			goto out;
+ 		}
+
+--- a/inode.c
++++ b/inode.c
+@@ -1046,7 +1046,7 @@
+ 	if (!ret && i2)
+ 		ret = writeback_inode(i2);
+ 	if (!ret)
+-		ret = sync_blockdev_nowait(sb->s_bdev);
++		ret = filemap_flush(sb->s_bdev->bd_inode->i_mapping);
+ 	return ret;
+ }
+
+--- a/super.c
++++ b/super.c
+@@ -921,7 +921,7 @@
+ 
+ 	/* Parse boot. */
+ 	err = ntfs_init_from_boot(sb, rq ? queue_logical_block_size(rq) : 512,
+-				  bdev_nr_bytes(bdev));
++				  bdev->bd_inode->i_size);
+ 	if (err)
+ 		goto out;
+