From 11e23024c77c3a86f8de5792d31ba6645ec16190 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Mon, 15 Jan 2007 10:28:22 -0600
Subject: [PATCH] --- yaml --- r: 46292 b: refs/heads/master c:
 222d396092acc11b4af03bede309aa066945e920 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 98f3ff801d0f..ccffa16356db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1bc86e6bddd34362ca08a3a4d898eb4b5c15215
+refs/heads/master: 222d396092acc11b4af03bede309aa066945e920
diff --git a/trunk/fs/dlm/recover.c b/trunk/fs/dlm/recover.c
index a7fa4cb6cd16..c2cc7694cd16 100644
--- a/trunk/fs/dlm/recover.c
+++ b/trunk/fs/dlm/recover.c
@@ -397,7 +397,9 @@ int dlm_recover_masters(struct dlm_ls *ls)
 
 		if (dlm_no_directory(ls))
 			count += recover_master_static(r);
-		else if (!is_master(r) && dlm_is_removed(ls, r->res_nodeid)) {
+		else if (!is_master(r) &&
+			 (dlm_is_removed(ls, r->res_nodeid) ||
+			  rsb_flag(r, RSB_NEW_MASTER))) {
 			recover_master(r);
 			count++;
 		}