Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[powerpc.git] / fs / dlm / recoverd.c

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 7010353..362e3ef 100644 (file)
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -234,6 +234,10 @@ static int dlm_recoverd(void *arg)
        struct dlm_ls *ls;
 
        ls = dlm_find_lockspace_local(arg);
+       if (!ls) {
+               log_print("dlm_recoverd: no lockspace %p", arg);
+               return -1;
+       }
 
        while (!kthread_should_stop()) {
                set_current_state(TASK_INTERRUPTIBLE);
@@ -275,6 +279,7 @@ void dlm_recoverd_stop(struct dlm_ls *ls)
 
 void dlm_recoverd_suspend(struct dlm_ls *ls)
 {
+       wake_up(&ls->ls_wait_general);
        mutex_lock(&ls->ls_recoverd_active);
 }