|
 |
f20720 |
---
|
|
|
f20720 |
libmultipath/checkers/tur.c | 9 +++------
|
|
|
f20720 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
f20720 |
|
|
|
f20720 |
Index: multipath-tools-130222/libmultipath/checkers/tur.c
|
|
|
f20720 |
===================================================================
|
|
|
f20720 |
--- multipath-tools-130222.orig/libmultipath/checkers/tur.c
|
|
|
f20720 |
+++ multipath-tools-130222/libmultipath/checkers/tur.c
|
|
|
f20720 |
@@ -409,7 +409,6 @@ libcheck_check (struct checker * c)
|
|
|
f20720 |
ct->running = 0;
|
|
|
f20720 |
MSG(c, MSG_TUR_TIMEOUT);
|
|
|
f20720 |
tur_status = PATH_DOWN;
|
|
|
f20720 |
- ct->state = PATH_UNCHECKED;
|
|
|
f20720 |
} else {
|
|
|
f20720 |
condlog(3, "%d:%d: tur checker not finished",
|
|
|
f20720 |
TUR_DEVT(ct));
|
|
|
f20720 |
@@ -426,12 +425,10 @@ libcheck_check (struct checker * c)
|
|
|
f20720 |
pthread_mutex_unlock(&ct->lock);
|
|
|
f20720 |
} else {
|
|
|
f20720 |
if (ct->thread) {
|
|
|
f20720 |
- /* pthread cancel failed. continue in sync mode */
|
|
|
f20720 |
pthread_mutex_unlock(&ct->lock);
|
|
|
f20720 |
- condlog(3, "%d:%d: tur thread not responding, "
|
|
|
f20720 |
- "using sync mode", TUR_DEVT(ct));
|
|
|
f20720 |
- return tur_check(c->fd, c->timeout, c->message,
|
|
|
f20720 |
- ct->wwid);
|
|
|
f20720 |
+ condlog(3, "%d:%d: tur thread not responding, ",
|
|
|
f20720 |
+ TUR_DEVT(ct));
|
|
|
f20720 |
+ return PATH_DOWN;
|
|
|
f20720 |
}
|
|
|
f20720 |
/* Start new TUR checker */
|
|
|
f20720 |
ct->state = PATH_UNCHECKED;
|