Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / fs / dlm / member.c

diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index f08faec3d854a70a07a4a82e4efcabf9cbc57f20..073599dced2ab4b2562f8f7df44db66aeaa079cc 100644 (file)
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -233,6 +233,12 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
        *neg_out = neg;
 
        error = ping_members(ls);
+       if (!error || error == -EPROTO) {
+               /* new_lockspace() may be waiting to know if the config
+                  is good or bad */
+               ls->ls_members_result = error;
+               complete(&ls->ls_members_done);
+       }
        if (error)
                goto out;