From 47d132054eb2eeae2209557584fc036aa05aa044 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Fri, 13 Apr 2018 17:33:31 -0500 Subject: [PATCH] device-mapper-multipath-0.7.6-2.git1cb704b Add 0007-libmultipath-Fix-logic-in-should_multipath.patch * fix bug in identifying multipathable devices. posted upstream Rename files * Previous patches 0007-0014 are now patches 0008-0015 --- ...tipath-Fix-logic-in-should_multipath.patch | 30 +++++++++++++++++++ ... 0008-RH-fixup-udev-rules-for-redhat.patch | 0 ...property-blacklist-exception-builtin.patch | 0 ...RH-don-t-start-without-a-config-file.patch | 0 ... 0011-RH-use-rpm-optflags-if-present.patch | 0 ...hconf.patch => 0012-RH-add-mpathconf.patch | 0 ...om-kernel-cmdline-mpath.wwids-with-A.patch | 2 +- ...change-uevent-on-new-device-creation.patch | 2 +- ...-on-invalid-regex-instead-of-failing.patch | 0 device-mapper-multipath.spec | 26 ++++++++++------ 10 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 0007-libmultipath-Fix-logic-in-should_multipath.patch rename 0007-RH-fixup-udev-rules-for-redhat.patch => 0008-RH-fixup-udev-rules-for-redhat.patch (100%) rename 0008-RH-Remove-the-property-blacklist-exception-builtin.patch => 0009-RH-Remove-the-property-blacklist-exception-builtin.patch (100%) rename 0009-RH-don-t-start-without-a-config-file.patch => 0010-RH-don-t-start-without-a-config-file.patch (100%) rename 0010-RH-use-rpm-optflags-if-present.patch => 0011-RH-use-rpm-optflags-if-present.patch (100%) rename 0011-RH-add-mpathconf.patch => 0012-RH-add-mpathconf.patch (100%) rename 0012-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch => 0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch (99%) rename 0013-RH-trigger-change-uevent-on-new-device-creation.patch => 0014-RH-trigger-change-uevent-on-new-device-creation.patch (99%) rename 0014-RH-warn-on-invalid-regex-instead-of-failing.patch => 0015-RH-warn-on-invalid-regex-instead-of-failing.patch (100%) diff --git a/0007-libmultipath-Fix-logic-in-should_multipath.patch b/0007-libmultipath-Fix-logic-in-should_multipath.patch new file mode 100644 index 0000000..94ad3ff --- /dev/null +++ b/0007-libmultipath-Fix-logic-in-should_multipath.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Fri, 13 Apr 2018 19:20:42 +0200 +Subject: [PATCH] libmultipath: Fix logic in should_multipath + +Commit d3b71498 missed a negation. + +Fixes: d3b71498 "multipath: fix rcu thread cancellation hang" +Signed-off-by: Martin Wilck +Signed-off-by: Benjamin Marzinski +--- + libmultipath/wwids.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c +index 0ec9f25..8c21b33 100644 +--- a/libmultipath/wwids.c ++++ b/libmultipath/wwids.c +@@ -284,7 +284,7 @@ should_multipath(struct path *pp1, vector pathvec) + ignore_new_devs = conf->ignore_new_devs; + find_multipaths = conf->find_multipaths; + put_multipath_config(conf); +- if (find_multipaths && !ignore_new_devs) ++ if (!find_multipaths && !ignore_new_devs) + return 1; + + condlog(4, "checking if %s should be multipathed", pp1->dev); +-- +2.7.4 + diff --git a/0007-RH-fixup-udev-rules-for-redhat.patch b/0008-RH-fixup-udev-rules-for-redhat.patch similarity index 100% rename from 0007-RH-fixup-udev-rules-for-redhat.patch rename to 0008-RH-fixup-udev-rules-for-redhat.patch diff --git a/0008-RH-Remove-the-property-blacklist-exception-builtin.patch b/0009-RH-Remove-the-property-blacklist-exception-builtin.patch similarity index 100% rename from 0008-RH-Remove-the-property-blacklist-exception-builtin.patch rename to 0009-RH-Remove-the-property-blacklist-exception-builtin.patch diff --git a/0009-RH-don-t-start-without-a-config-file.patch b/0010-RH-don-t-start-without-a-config-file.patch similarity index 100% rename from 0009-RH-don-t-start-without-a-config-file.patch rename to 0010-RH-don-t-start-without-a-config-file.patch diff --git a/0010-RH-use-rpm-optflags-if-present.patch b/0011-RH-use-rpm-optflags-if-present.patch similarity index 100% rename from 0010-RH-use-rpm-optflags-if-present.patch rename to 0011-RH-use-rpm-optflags-if-present.patch diff --git a/0011-RH-add-mpathconf.patch b/0012-RH-add-mpathconf.patch similarity index 100% rename from 0011-RH-add-mpathconf.patch rename to 0012-RH-add-mpathconf.patch diff --git a/0012-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch similarity index 99% rename from 0012-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch rename to 0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch index 23af6db..0bb6651 100644 --- a/0012-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +++ b/0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch @@ -22,7 +22,7 @@ Signed-off-by: Benjamin Marzinski 5 files changed, 58 insertions(+), 3 deletions(-) diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index 0ec9f25..9722714 100644 +index 8c21b33..82cef12 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c @@ -323,3 +323,47 @@ remember_wwid(char *wwid) diff --git a/0013-RH-trigger-change-uevent-on-new-device-creation.patch b/0014-RH-trigger-change-uevent-on-new-device-creation.patch similarity index 99% rename from 0013-RH-trigger-change-uevent-on-new-device-creation.patch rename to 0014-RH-trigger-change-uevent-on-new-device-creation.patch index 726a54d..a7c133d 100644 --- a/0013-RH-trigger-change-uevent-on-new-device-creation.patch +++ b/0014-RH-trigger-change-uevent-on-new-device-creation.patch @@ -75,7 +75,7 @@ index 27a7e6f..545cbc2 100644 struct udev_device *get_udev_device(const char *dev, enum devtypes dev_type); +void trigger_paths_udev_change(const struct multipath *mpp); diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c -index 9722714..9e9baed 100644 +index 82cef12..6c88a3b 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c @@ -321,7 +321,7 @@ remember_wwid(char *wwid) diff --git a/0014-RH-warn-on-invalid-regex-instead-of-failing.patch b/0015-RH-warn-on-invalid-regex-instead-of-failing.patch similarity index 100% rename from 0014-RH-warn-on-invalid-regex-instead-of-failing.patch rename to 0015-RH-warn-on-invalid-regex-instead-of-failing.patch diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index 2ac68a4..e54dc7d 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.7.6 -Release: 1.git1cb704b%{?dist} +Release: 2.git1cb704b%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -17,14 +17,15 @@ Patch0003: 0003-multipathd-minor-dmevents-polling-code-cleanups.patch Patch0004: 0004-multipathd-remove-unneeded-function-parameter.patch Patch0005: 0005-mpathcmd-fix-libmpathcmd-license.patch Patch0006: 0006-libmultipath-don-t-print-undefined-values.patch -Patch0007: 0007-RH-fixup-udev-rules-for-redhat.patch -Patch0008: 0008-RH-Remove-the-property-blacklist-exception-builtin.patch -Patch0009: 0009-RH-don-t-start-without-a-config-file.patch -Patch0010: 0010-RH-use-rpm-optflags-if-present.patch -Patch0011: 0011-RH-add-mpathconf.patch -Patch0012: 0012-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch -Patch0013: 0013-RH-trigger-change-uevent-on-new-device-creation.patch -Patch0014: 0014-RH-warn-on-invalid-regex-instead-of-failing.patch +Patch0007: 0007-libmultipath-Fix-logic-in-should_multipath.patch +Patch0008: 0008-RH-fixup-udev-rules-for-redhat.patch +Patch0009: 0009-RH-Remove-the-property-blacklist-exception-builtin.patch +Patch0010: 0010-RH-don-t-start-without-a-config-file.patch +Patch0011: 0011-RH-use-rpm-optflags-if-present.patch +Patch0012: 0012-RH-add-mpathconf.patch +Patch0013: 0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +Patch0014: 0014-RH-trigger-change-uevent-on-new-device-creation.patch +Patch0015: 0015-RH-warn-on-invalid-regex-instead-of-failing.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -117,6 +118,7 @@ device-mapper-multipath's libdmmp C API library %patch0012 -p1 %patch0013 -p1 %patch0014 -p1 +%patch0015 -p1 cp %{SOURCE1} . %build @@ -240,6 +242,12 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Fri Apr 13 2018 Benjamin Marzinski 0.7.6-2.git1cb704b +- Add 0007-libmultipath-Fix-logic-in-should_multipath.patch + * fix bug in identifying multipathable devices. posted upstream +- Rename files + * Previous patches 0007-0014 are now patches 0008-0015 + * Tue Apr 02 2018 Björn Esser - 0.7.6-1.git1cb704b - Update Source to the latest upstream commit * Previous patches 0001-0014 are included in this commit