DLM: retry rcom when dlm_wait_function is timed out.

[linux-2.6-microblaze.git] / fs / dlm / recover.c

diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index eaea789..ce2aa54 100644 (file)
--- a/fs/dlm/recover.c
+++ b/fs/dlm/recover.c
@@ -52,6 +52,10 @@ int dlm_wait_function(struct dlm_ls *ls, int (*testfn) (struct dlm_ls *ls))
                                        dlm_config.ci_recover_timer * HZ);
                if (rv)
                        break;
+               if (test_bit(LSFL_RCOM_WAIT, &ls->ls_flags)) {
+                       log_debug(ls, "dlm_wait_function timed out");
+                       return -ETIMEDOUT;
+               }
        }
 
        if (dlm_recovery_stopped(ls)) {