src/main.c

[David Teigland]

src/main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 285ab4a63c6e4fee96983a7648c28081172ac479
Author: David Teigland 
Date:   Mon Mar 14 13:31:28 2011 -0500

sanlock: fix wdmd stop order

Need to stop wdmd renewal thread before disabling wdmd
    for a given resource; otherwise, the wd test can be
    reenabled right after we disable it.

diff --git a/src/main.c b/src/main.c
index f90b6d9..b80f87f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -394,12 +394,12 @@ static int main_loop(void)
    	list_for_each_entry_safe(sp, safe, &spaces, list) {
    		if (sp->killing_pids) {
    			if (all_pids_dead(sp)) {
-					unlink_watchdog_file(sp);
    				log_space(sp, "set thread_stop");
    				pthread_mutex_lock(&sp->mutex);
    				sp->thread_stop = 1;
    				pthread_cond_broadcast(&sp->cond);
    				pthread_mutex_unlock(&sp->mutex);
+					unlink_watchdog_file(sp);
    				list_move(&sp->list, &spaces_remove);
    			} else {
    				kill_pids(sp);