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

0007-libmultipath-Fix-logic-in-should_multipath.patch

@@ -0,0 +1,30 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+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 <mwilck@suse.com>
+Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
+---
+ 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
+

0013-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch

@@ -22,7 +22,7 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
  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)

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)

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 <bmarzins@redhat.com> 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 <besser82@fedoraproject.org> - 0.7.6-1.git1cb704b
 - Update Source to the latest upstream commit
   * Previous patches 0001-0014 are included in this commit