---

yaml
---
r: 43287
b: refs/heads/master
c: 2cdc98a
h: refs/heads/master
i:
  43285: 6babb76
  43283: 1ef33d1
  43279: 36ca3ca
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91c0dc93a1a6bbdd79707ed311e48b4397df177f
+refs/heads/master: 2cdc98aaf072d573df10c503d3b3b0b74e2a6d06

trunk/fs/dlm/recoverd.c

@@ -219,14 +219,19 @@ 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;
 
 	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) {