From f4854ff83263aaa30dbdb3139b823e276067bcf7 Mon Sep 17 00:00:00 2001
From: Jonathon Fernyhough <jonathon@m2x.dev>
Date: Fri, 28 May 2021 20:53:49 +0100
Subject: [PATCH] [zfs-dkms] 5.12 backports

This includes two further approved backport PRs for the zfs-2.0.5-staging branch
(https://github.com/openzfs/zfs/pull/12139, https://github.com/openzfs/zfs/pull/12141)
and switches compat patches from 12009 to the merged commits.

It also includes bugfix https://github.com/openzfs/zfs/pull/12155 .
---
 zfs-dkms/.SRCINFO | 27 ++++++++++++++++++++-------
 zfs-dkms/PKGBUILD | 40 +++++++++++++++++++++++++++++++---------
 2 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/zfs-dkms/.SRCINFO b/zfs-dkms/.SRCINFO
index 2ffb8bd..b7c3fa8 100644
--- a/zfs-dkms/.SRCINFO
+++ b/zfs-dkms/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	pkgver = 2.0.4
-	pkgrel = 2
+	pkgrel = 3
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL
@@ -13,22 +13,35 @@ pkgbase = zfs-dkms
 	replaces = spl-dkms
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc
-	source = https://github.com/openzfs/zfs/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch
-	source = https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch
+	source = https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch
+	source = https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch
+	source = https://github.com/openzfs/zfs/pull/12139/commits/6e87a2a66e890a503286d634031fd433792fb1d4.patch
+	source = https://github.com/openzfs/zfs/pull/12139/commits/068c3af1dba8edb30e2507af5732430da1c35e6e.patch
+	source = https://github.com/openzfs/zfs/pull/12141/commits/49fb50cbc80c2ff074dfca269634cc512ae8437c.patch
+	source = https://github.com/openzfs/zfs/pull/12155/commits/1a2e9aa0e21c12ec1fee60dbcd121659bb1c5b7a.patch
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
 	sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c
 	sha256sums = SKIP
-	sha256sums = 6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874
-	sha256sums = 61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028
+	sha256sums = f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8
+	sha256sums = d44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1
+	sha256sums = aa6e9556115ac81a064907d7e95944b7b2f045b9f932b0c692c2e8121c995c54
+	sha256sums = 27016c1f18128274d61825887f7345718fb5c5da70c05679efa98b28a3948d7e
+	sha256sums = 911f7e9aa17c4b646e42344cb11620361846be25c53de77f669b89cd24e09dc7
+	sha256sums = b033b3f49bafe21ef6335e0a9bcb2a749c60ba3c7a9da56cb601af9d7a0ca286
 	sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
 	b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c
 	b2sums = SKIP
-	b2sums = 195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f
-	b2sums = d6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54
+	b2sums = 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf
+	b2sums = cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2
+	b2sums = ceee0c6d5d9046d10c8b2a68c3778ec94bfe1159aedeadd514f5669eb7d2caa380ab6b11f0286d903a7d9871c90b12c569fb4ded0766be06c255fa2fb31a324e
+	b2sums = 54eb746c4c7b03bb2d17077a3643bb609bfdd38ab0a4ab04c9220490dfbae56cda4f25837e7b65c519ca231f351a9113c2c5b8e1361b7dcb2497bbd59d287a9e
+	b2sums = 2e875753c9a8fc6f84f004df357a15153f5ab97e9c50a87d6adbc5114b83c694cac6aa9d47fdadb27449f3e75d627356dd682a707a12a2c67dfb6b9e91e19a1b
+	b2sums = a7716e8a0f656f15819a8b1b7e7bc0ffe8f24426d56aa0340be038eb957778bdc856ea0ceba97a35f33cda8c6a6f5e7757b58b7b02b48bc10f86dfe949665c91
 	b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
 
 pkgname = zfs-dkms
 	depends = zfs-utils=2.0.4
 	depends = dkms
+
diff --git a/zfs-dkms/PKGBUILD b/zfs-dkms/PKGBUILD
index eb2ca3d..34301cd 100644
--- a/zfs-dkms/PKGBUILD
+++ b/zfs-dkms/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=zfs-dkms
 pkgver=2.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Kernel modules for the Zettabyte File System."
 arch=('any')
 url="https://zfsonlinux.org/"
@@ -16,18 +16,30 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
 provides+=('zfs')
 replaces=('spl-dkms')
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
-        "https://github.com/openzfs/zfs/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch"
-        "https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch"
+        "https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch"
+        "https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch"
+        "https://github.com/openzfs/zfs/pull/12139/commits/6e87a2a66e890a503286d634031fd433792fb1d4.patch"
+        "https://github.com/openzfs/zfs/pull/12139/commits/068c3af1dba8edb30e2507af5732430da1c35e6e.patch"
+        "https://github.com/openzfs/zfs/pull/12141/commits/49fb50cbc80c2ff074dfca269634cc512ae8437c.patch"
+        "https://github.com/openzfs/zfs/pull/12155/commits/1a2e9aa0e21c12ec1fee60dbcd121659bb1c5b7a.patch"
         "0001-only-build-the-module-in-dkms.conf.patch")
 sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c'
             'SKIP'
-            '6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874'
-            '61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028'
+            'f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8'
+            'd44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1'
+            'aa6e9556115ac81a064907d7e95944b7b2f045b9f932b0c692c2e8121c995c54'
+            '27016c1f18128274d61825887f7345718fb5c5da70c05679efa98b28a3948d7e'
+            '911f7e9aa17c4b646e42344cb11620361846be25c53de77f669b89cd24e09dc7'
+            'b033b3f49bafe21ef6335e0a9bcb2a749c60ba3c7a9da56cb601af9d7a0ca286'
             '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
 b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c'
         'SKIP'
-        '195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f'
-        'd6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54'
+        '49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf'
+        'cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2'
+        'ceee0c6d5d9046d10c8b2a68c3778ec94bfe1159aedeadd514f5669eb7d2caa380ab6b11f0286d903a7d9871c90b12c569fb4ded0766be06c255fa2fb31a324e'
+        '54eb746c4c7b03bb2d17077a3643bb609bfdd38ab0a4ab04c9220490dfbae56cda4f25837e7b65c519ca231f351a9113c2c5b8e1361b7dcb2497bbd59d287a9e'
+        '2e875753c9a8fc6f84f004df357a15153f5ab97e9c50a87d6adbc5114b83c694cac6aa9d47fdadb27449f3e75d627356dd682a707a12a2c67dfb6b9e91e19a1b'
+        'a7716e8a0f656f15819a8b1b7e7bc0ffe8f24426d56aa0340be038eb957778bdc856ea0ceba97a35f33cda8c6a6f5e7757b58b7b02b48bc10f86dfe949665c91'
         '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -38,8 +50,18 @@ prepare() {
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
     # Kernel 5.12 compat, https://github.com/openzfs/zfs/pull/12009
-    patch -p1 -i ../938a7a375b2c18fef621fb30d71bec0c19e94142.patch
-    patch -p1 -i ../8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch
+    patch -p1 -i ../f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch
+    patch -p1 -i ../77352db228c07ce8ba50478b9029820ca69c6c1b.patch
+
+    # Kernel 5.12 backport "fixes for tmpiles and userns changes", https://github.com/openzfs/zfs/pull/12139
+    patch -p1 -i ../6e87a2a66e890a503286d634031fd433792fb1d4.patch
+    patch -p1 -i ../068c3af1dba8edb30e2507af5732430da1c35e6e.patch
+
+    # Kernel 5.12 backport "Fix dmu_recv_stream test for resumable", https://github.com/openzfs/zfs/pull/12141
+    patch -p1 -i ../49fb50cbc80c2ff074dfca269634cc512ae8437c.patch
+
+    # Bugfix, "Remove iov_iter_advance() for iter_write", https://github.com/openzfs/zfs/pull/12155
+    patch -p1 -i ../1a2e9aa0e21c12ec1fee60dbcd121659bb1c5b7a.patch
 
     # remove unneeded sections from module build
     sed -ri "/AC_CONFIG_FILES/,/]\)/{