summaryrefslogtreecommitdiff
path: root/sys-fs/zfs-utils
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-02 10:34:02 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-02 10:34:02 +0000
commit8332e832f486fabafb59a118b42e03c8440b2968 (patch)
tree5b3b1e221050e839aefb933907102b2eb31ac5f5 /sys-fs/zfs-utils
parent7475c99fc8561e533539b7e510293c488c6b2e7c (diff)
sys-fs/zfs-utils : backport fix for https://github.com/zfsonlinux/zfs/issues/9417
Diffstat (limited to 'sys-fs/zfs-utils')
-rw-r--r--sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch12
-rw-r--r--sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild (renamed from sys-fs/zfs-utils/zfs-utils-0.8.2.ebuild)3
2 files changed, 14 insertions, 1 deletions
diff --git a/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch b/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch
new file mode 100644
index 00000000..ad612d26
--- /dev/null
+++ b/sys-fs/zfs-utils/files/Use_NMH_WAIT_EXEC_with_call.patch
@@ -0,0 +1,12 @@
+diff -Nur a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
+--- a/module/zfs/vdev_disk.c 2019-09-25 21:44:42.626286618 +0100
++++ b/module/zfs/vdev_disk.c 2020-01-02 10:29:56.356741395 +0000
+@@ -220,7 +220,7 @@
+ char *envp[] = { NULL };
+
+ argv[2] = kmem_asprintf(SET_SCHEDULER_CMD, device, elevator);
+- error = call_usermodehelper(argv[0], argv, envp, UMH_NO_WAIT);
++ error = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
+ strfree(argv[2]);
+ #endif /* HAVE_ELEVATOR_CHANGE */
+ if (error) {
diff --git a/sys-fs/zfs-utils/zfs-utils-0.8.2.ebuild b/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild
index 039c344c..35ca27f8 100644
--- a/sys-fs/zfs-utils/zfs-utils-0.8.2.ebuild
+++ b/sys-fs/zfs-utils/zfs-utils-0.8.2-r1.ebuild
@@ -61,7 +61,8 @@ RESTRICT="test"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch"
+ "${FILESDIR}/Use_NMH_WAIT_EXEC_with_call.patch" )
src_prepare() {
default