author: David Teigland <teigland@redhat.com> 2007-01-15 10:28:22 -0600
committer: Steven Whitehouse <swhiteho@redhat.com> 2007-02-05 13:36:58 -0500
commit: 222d396092acc11b4af03bede309aa066945e920
parent: a1bc86e6bddd34362ca08a3a4d898eb4b5c15215
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 1 deletion
diff --git a/fs/dlm/recover.c b/fs/dlm/recover.c
index a7fa4cb6cd16..c2cc7694cd16 100644
--- a/fs/dlm/recover.c
+++ b/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++;
}