multipath-tools/patches/0082-UPBZ-1109995-no-sync-turs-on-pthread_cancel.patch

   1 ---
   2  libmultipath/checkers/tur.c |    9 +++------
   3  1 file changed, 3 insertions(+), 6 deletions(-)
   4
   5 Index: multipath-tools-130222/libmultipath/checkers/tur.c
   6 ===================================================================
   7 --- multipath-tools-130222.orig/libmultipath/checkers/tur.c
   8 +++ multipath-tools-130222/libmultipath/checkers/tur.c
   9 @@ -409,7 +409,6 @@ libcheck_check (struct checker * c)
  10                                 ct->running = 0;
  11                                 MSG(c, MSG_TUR_TIMEOUT);
  12                                 tur_status = PATH_DOWN;
  13 -                               ct->state = PATH_UNCHECKED;
  14                         } else {
  15                                 condlog(3, "%d:%d: tur checker not finished",
  16                                         TUR_DEVT(ct));
  17 @@ -426,12 +425,10 @@ libcheck_check (struct checker * c)
  18                 pthread_mutex_unlock(&ct->lock);
  19         } else {
  20                 if (ct->thread) {
  21 -                       /* pthread cancel failed. continue in sync mode */
  22                         pthread_mutex_unlock(&ct->lock);
  23 -                       condlog(3, "%d:%d: tur thread not responding, "
  24 -                               "using sync mode", TUR_DEVT(ct));
  25 -                       return tur_check(c->fd, c->timeout, c->message,
  26 -                                        ct->wwid);
  27 +                       condlog(3, "%d:%d: tur thread not responding, ",
  28 +                               TUR_DEVT(ct));
  29 +                       return PATH_DOWN;
  30                 }
  31                 /* Start new TUR checker */
  32                 ct->state = PATH_UNCHECKED;