Instead of grabbing the lock at the start of the checkerloop
and releasing it at the end we should be holding it only
during the time when we actually need it.
Signed-off-by: Hannes Reinecke <hare@xxxxxxx>
---
multipathd/main.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/multipathd/main.c b/multipathd/main.c
index f876258..9e7bf4f 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -1399,32 +1399,40 @@ checkerloop (void *ap)
if (gettimeofday(&start_time, NULL) != 0)
start_time.tv_sec = 0;
- pthread_cleanup_push(cleanup_lock, &vecs->lock);
- lock(vecs->lock);
- pthread_testcancel();
condlog(4, "tick");
#ifdef USE_SYSTEMD
if (use_watchdog)
sd_notify(0, "WATCHDOG=1");
#endif
if (vecs->pathvec) {
+ pthread_cleanup_push(cleanup_lock, &vecs->lock);
+ lock(vecs->lock);
+ pthread_testcancel();
vector_foreach_slot (vecs->pathvec, pp, i) {
num_paths += check_path(vecs, pp);
}
+ lock_cleanup_pop(vecs->lock);
}
if (vecs->mpvec) {
+ pthread_cleanup_push(cleanup_lock, &vecs->lock);
+ lock(vecs->lock);
+ pthread_testcancel();
defered_failback_tick(vecs->mpvec);
retry_count_tick(vecs->mpvec);
+ lock_cleanup_pop(vecs->lock);
}
if (count)
count--;
else {
+ pthread_cleanup_push(cleanup_lock, &vecs->lock);
+ lock(vecs->lock);
+ pthread_testcancel();
condlog(4, "map garbage collection");
mpvec_garbage_collector(vecs);
count = MAPGCINT;
+ lock_cleanup_pop(vecs->lock);
}
- lock_cleanup_pop(vecs->lock);
if (start_time.tv_sec &&
gettimeofday(&end_time, NULL) == 0 &&
num_paths) {
--
1.8.4.5
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/dm-devel
