X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2Fdlm%2Fmember.c;h=85e2897bd7400fc4155948fc8eb1c81cb1ff8e01;hb=18963c01b8abf381f102752ce024c3582a716125;hp=a3f7de7f3a8f969b9500875203297f4b8d6872ef;hpb=97d41e90fe61399b99d74820cb7f2d6e0fbac91d;p=mv-sheeva.git

diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index a3f7de7f3a8..85e2897bd74 100644
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -186,6 +186,14 @@ int dlm_recover_members(struct dlm_ls *ls, struct dlm_recover *rv, int *neg_out)
 	struct dlm_member *memb, *safe;
 	int i, error, found, pos = 0, neg = 0, low = -1;
 
+	/* previously removed members that we've not finished removing need to
+	   count as a negative change so the "neg" recovery steps will happen */
+
+	list_for_each_entry(memb, &ls->ls_nodes_gone, list) {
+		log_debug(ls, "prev removed member %d", memb->nodeid);
+		neg++;
+	}
+
 	/* move departed members from ls_nodes to ls_nodes_gone */
 
 	list_for_each_entry_safe(memb, safe, &ls->ls_nodes, list) {