From a538ff74038e9504b3fcf421bc21e7216b94f923 Mon Sep 17 00:00:00 2001
From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Thu, 5 Sep 2013 11:01:40 -0500
Subject: [PATCH] device-mapper-multipath-0.4.9-56

Add 0061-RH-display-find-mpaths.patch
  * display the find_multipaths value in show config
Add 0062-RH-dont-free-vecs.patch
  * don't free the vecs structure on shutdown. It's more pain than
    it's worth.
---
 0061-RH-display-find-mpaths.patch | 17 +++++++++++++++++
 0062-RH-dont-free-vecs.patch      | 28 ++++++++++++++++++++++++++++
 device-mapper-multipath.spec      | 13 ++++++++++++-
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 0061-RH-display-find-mpaths.patch
 create mode 100644 0062-RH-dont-free-vecs.patch

diff --git a/0061-RH-display-find-mpaths.patch b/0061-RH-display-find-mpaths.patch
new file mode 100644
index 0000000..05c63f0
--- /dev/null
+++ b/0061-RH-display-find-mpaths.patch
@@ -0,0 +1,17 @@
+---
+ libmultipath/dict.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: multipath-tools-130222/libmultipath/dict.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/dict.c
++++ multipath-tools-130222/libmultipath/dict.c
+@@ -2717,8 +2717,6 @@ snprint_def_log_checker_err (char * buff
+ static int
+ snprint_def_find_multipaths (char * buff, int len, void * data)
+ {
+-	if (conf->find_multipaths == DEFAULT_FIND_MULTIPATHS)
+-		return 0;
+ 	if (!conf->find_multipaths)
+ 		return snprintf(buff, len, "no");
+ 
diff --git a/0062-RH-dont-free-vecs.patch b/0062-RH-dont-free-vecs.patch
new file mode 100644
index 0000000..f1c3217
--- /dev/null
+++ b/0062-RH-dont-free-vecs.patch
@@ -0,0 +1,28 @@
+---
+ multipathd/main.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+Index: multipath-tools-130222/multipathd/main.c
+===================================================================
+--- multipath-tools-130222.orig/multipathd/main.c
++++ multipath-tools-130222/multipathd/main.c
+@@ -1735,8 +1735,9 @@ child (void * param)
+ 	vecs->pathvec = NULL;
+ 	unlock(vecs->lock);
+ 	/* Now all the waitevent threads will start rushing in. */
++	/* freeing vecs isn't worth the races
+ 	while (vecs->lock.depth > 0) {
+-		sleep (1); /* This is weak. */
++		sleep (1);
+ 		condlog(3, "Have %d wait event checkers threads to de-alloc,"
+ 			" waiting...", vecs->lock.depth);
+ 	}
+@@ -1746,7 +1747,7 @@ child (void * param)
+ 	vecs->lock.mutex = NULL;
+ 	FREE(vecs);
+ 	vecs = NULL;
+-
++	*/
+ 	cleanup_checkers();
+ 	cleanup_prio();
+ 
diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index 259e76c..503910d 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.4.9
-Release: 55%{?dist}
+Release: 56%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -68,6 +68,8 @@ Patch0057: 0057-UP-fix-tmo.patch
 Patch0058: 0058-UP-fix-failback.patch
 Patch0059: 0059-UP-flush-failure-queueing.patch
 Patch0060: 0060-UP-uevent-loop-udev.patch
+Patch0061: 0061-RH-display-find-mpaths.patch
+Patch0062: 0062-RH-dont-free-vecs.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -180,6 +182,8 @@ kpartx manages partition creation and removal for device-mapper devices.
 %patch0058 -p1
 %patch0059 -p1
 %patch0060 -p1
+%patch0061 -p1
+%patch0062 -p1
 cp %{SOURCE1} .
 
 %build
@@ -273,6 +277,13 @@ bin/systemctl --no-reload enable multipathd.service >/dev/null 2>&1 ||:
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Sep  5 2013 Benjamin Marzinski <bmarzins@redhat.com> 0.4.9-56
+- Add 0061-RH-display-find-mpaths.patch
+  * display the find_multipaths value in show config
+- Add 0062-RH-dont-free-vecs.patch
+  * don't free the vecs structure on shutdown. It's more pain than
+    it's worth.
+
 * Thu Jul 25 2013 Benjamin Marzinski <bmarzins@redhat.com> 0.4.9-55
 - Modify 0015-RH-fix-output-buffer.patch
   * Fix memory leak