From 7d9bc0bf72e7eb15f789c994aa2281c4a5608927 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Wed, 1 Nov 2006 09:31:48 -0600
Subject: [PATCH] --- yaml --- r: 43288 b: refs/heads/master c:
 4b77f2c93d052adca8cc8690b9b5e7f8798f4ddd h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/dlm/recoverd.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7a70514d06e2..86847a62f173 100644
--- 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
index 6e4ee94ce7df..8bb895ffd90e 100644
--- 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);