multipath-tools: Update to snapshot from 2013-02-22

[people/pmueller/ipfire-3.x.git] / multipath-tools / patches / 0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch

diff --git a/multipath-tools/patches/0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch b/multipath-tools/patches/0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch
new file mode 100644 (file)
index 0000000..9a1bd34
--- /dev/null
+++ b/multipath-tools/patches/0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch
@@ -0,0 +1,32 @@
+---
+ libmultipath/checkers/tur.c |    9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+Index: multipath-tools-130222/libmultipath/checkers/tur.c
+===================================================================
+--- multipath-tools-130222.orig/libmultipath/checkers/tur.c
++++ multipath-tools-130222/libmultipath/checkers/tur.c
+@@ -409,7 +409,6 @@ libcheck_check (struct checker * c)
+                               ct->running = 0;
+                               MSG(c, MSG_TUR_TIMEOUT);
+                               tur_status = PATH_DOWN;
+-                              ct->state = PATH_UNCHECKED;
+                       } else {
+                               condlog(3, "%d:%d: tur checker not finished",
+                                       TUR_DEVT(ct));
+@@ -426,12 +425,10 @@ libcheck_check (struct checker * c)
+               pthread_mutex_unlock(&ct->lock);
+       } else {
+               if (ct->thread) {
+-                      /* pthread cancel failed. continue in sync mode */
+                       pthread_mutex_unlock(&ct->lock);
+-                      condlog(3, "%d:%d: tur thread not responding, "
+-                              "using sync mode", TUR_DEVT(ct));
+-                      return tur_check(c->fd, c->timeout, c->message,
+-                                       ct->wwid);
++                      condlog(3, "%d:%d: tur thread not responding, ",
++                              TUR_DEVT(ct));
++                      return PATH_DOWN;
+               }
+               /* Start new TUR checker */
+               ct->state = PATH_UNCHECKED;