---

yaml --- r: 46292 b: refs/heads/master c: 222d396 h: refs/heads/master v: v3
git-mirror · Feb 5, 2007 · 11e2302 · 11e2302
1 parent d9a73f7
commit 11e2302
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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++;
 		}