31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
Date: Wed, 28 Mar 2018 16:47:05 -0500
|
||
|
|
Subject: [PATCH] multipathd: remove incorrect pthread_testcancel
|
||
|
|
|
||
|
|
As Martin Wilck pointed out, a thread that's trying to stop the waiter
|
||
|
|
thread should not cancel itself before it gets a chance to do so
|
||
|
|
|
||
|
|
Cc: Martin Wilck <mwilck@suse.com>
|
||
|
|
Fixes: c7625f92 "multipathd: fix waiter thread cancelling"
|
||
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
||
|
|
---
|
||
|
|
multipathd/waiter.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/multipathd/waiter.c b/multipathd/waiter.c
|
||
|
|
index 595c69a..0ef8b25 100644
|
||
|
|
--- a/multipathd/waiter.c
|
||
|
|
+++ b/multipathd/waiter.c
|
||
|
|
@@ -68,7 +68,6 @@ void stop_waiter_thread (struct multipath *mpp, struct vectors *vecs)
|
||
|
|
mpp->waiter = (pthread_t)0;
|
||
|
|
pthread_cleanup_push(cleanup_lock, &waiter_lock);
|
||
|
|
lock(&waiter_lock);
|
||
|
|
- pthread_testcancel();
|
||
|
|
pthread_kill(thread, SIGUSR2);
|
||
|
|
pthread_cancel(thread);
|
||
|
|
lock_cleanup_pop(&waiter_lock);
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|