---

yaml --- r: 43288 b: refs/heads/master c: 4b77f2c h: refs/heads/master v: v3
git-mirror · Nov 30, 2006 · 7d9bc0b · 7d9bc0b
1 parent 6a3be6c
commit 7d9bc0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cdc98aaf072d573df10c503d3b3b0b74e2a6d06
+refs/heads/master: 4b77f2c93d052adca8cc8690b9b5e7f8798f4ddd
diff --git a/trunk/fs/dlm/recoverd.c b/trunk/fs/dlm/recoverd.c
@@ -168,9 +168,15 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 		/*
 		 * Other lockspace members may be going through the "neg" steps
 		 * while also adding us to the lockspace, in which case they'll
-		 * be looking for this status bit during dlm_recover_locks().
+		 * be doing the recover_locks (RS_LOCKS) barrier.
 		 */
 		dlm_set_recover_status(ls, DLM_RS_LOCKS);
+
+		error = dlm_recover_locks_wait(ls);
+		if (error) {
+			log_error(ls, "recover_locks_wait failed %d", error);
+			goto fail;
+		}
 	}
 
 	dlm_release_root_list(ls);