[DLM] fix stopping unstarted recovery

[linux-2.6-omap-h63xx.git] / fs / dlm / recoverd.c

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index 4a1d6023fd9b9dea797b7058267599f172f003d8..6e4ee94ce7df8ac0de5c8113167184377513b0b7 100644 (file)
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -219,6 +219,10 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
        return error;
 }
 
+/* The dlm_ls_start() that created the rv we take here may already have been
+   stopped via dlm_ls_stop(); in that case we need to leave the RECOVERY_STOP
+   flag set. */
+
 static void do_ls_recovery(struct dlm_ls *ls)
 {
        struct dlm_recover *rv = NULL;
@@ -226,7 +230,8 @@ static void do_ls_recovery(struct dlm_ls *ls)
        spin_lock(&ls->ls_recover_lock);
        rv = ls->ls_recover_args;
        ls->ls_recover_args = NULL;
-       clear_bit(LSFL_RECOVERY_STOP, &ls->ls_flags);
+       if (rv && ls->ls_recover_seq == rv->seq)
+               clear_bit(LSFL_RECOVERY_STOP, &ls->ls_flags);
        spin_unlock(&ls->ls_recover_lock);
 
        if (rv) {