Semi-automated update for kernel 5.0.13.arch1-1 + zfs 0.7.13

3 files changed, 41 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 19451f0de008..2916e1467dc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,10 +26,19 @@ pkgrel=1
 makedepends=("linux-vfio-headers=${_kernelver}")
 arch=("x86_64")
 url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_splver}/spl-${_splver}.tar.gz")
-sha256sums=("6fd4445850ac67b228fdd82fff7997013426a1c2a8fa9017ced70cc9ad2a4338")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_splver}/spl-${_splver}.tar.gz"
+        "linux-5.1-compat-drop-ULLONG_MAX-and-LLONG_MAX-definitions.patch"
+        "linux-5.1-compat-get-ds-removed.patch")
+sha256sums=("6fd4445850ac67b228fdd82fff7997013426a1c2a8fa9017ced70cc9ad2a4338"
+            "f110bd86a81602e531dda943cf0d066f09f3d58c297159ea285957ce28f0f0c1"
+            "d4a6c27aea521cf5635c1b9f679633c068b024606f634d5e6bf1a7b97db486c4")
 license=("GPL")
 depends=("kmod" "linux-vfio=${_kernelver}")
+prepare() {
+    cd "${srcdir}/spl-${_splver}"
+    patch -Np1 -i ${srcdir}/linux-5.1-compat-drop-ULLONG_MAX-and-LLONG_MAX-definitions.patch
+    patch -Np1 -i ${srcdir}/linux-5.1-compat-get-ds-removed.patch
+}
 
 build() {
     cd "${srcdir}/spl-${_splver}"
diff --git a/linux-5.1-compat-drop-ULLONG_MAX-and-LLONG_MAX-definitions.patch b/linux-5.1-compat-drop-ULLONG_MAX-and-LLONG_MAX-definitions.patch
new file mode 100644
index 000000000000..d1ec6abae162
--- /dev/null
+++ b/linux-5.1-compat-drop-ULLONG_MAX-and-LLONG_MAX-definitions.patch
@@ -0,0 +1,18 @@
+diff --unified --recursive --text a/include/sys/types.h b/include/sys/types.h
+--- a/include/sys/types.h	2019-02-22 12:55:48.000000000 -0500
++++ b/include/sys/types.h	2019-05-15 18:32:17.357535303 -0400
+@@ -28,14 +28,6 @@
+ #include <linux/types.h>
+ #include <sys/sysmacros.h>
+ 
+-#ifndef ULLONG_MAX
+-#define	ULLONG_MAX			(~0ULL)
+-#endif
+-
+-#ifndef LLONG_MAX
+-#define	LLONG_MAX			((long long)(~0ULL>>1))
+-#endif
+-
+ typedef enum { B_FALSE = 0, B_TRUE = 1 }	boolean_t;
+ typedef unsigned long			intptr_t;
+ typedef unsigned long			ulong_t;
diff --git a/linux-5.1-compat-get-ds-removed.patch b/linux-5.1-compat-get-ds-removed.patch
new file mode 100644
index 000000000000..6f2130aa1d34
--- /dev/null
+++ b/linux-5.1-compat-get-ds-removed.patch
@@ -0,0 +1,12 @@
+diff --unified --recursive --text a/module/spl/spl-vnode.c b/module/spl/spl-vnode.c
+--- a/module/spl/spl-vnode.c	2019-02-22 12:59:44.000000000 -0500
++++ b/module/spl/spl-vnode.c	2019-05-15 18:48:43.392458053 -0400
+@@ -608,7 +608,7 @@
+ 	 * size to ensure strncpy_from_user() does not fail with -EFAULT.
+ 	 */
+ 	saved_fs = get_fs();
+-	set_fs(get_ds());
++	set_fs(KERNEL_DS);
+ 
+ 	rc = user_path_dir(filename, &path);
+ 	if (rc)