From: Philipp Reisner <philipp.reisner@linbit.com>
Date: Thu, 4 Mar 2010 14:11:39 +0000 (+0100)
Subject: drbd: Forcing primary should also work for Consistent disks [Bugz 266]
X-Git-Tag: v2.6.34-rc4~11^2~22
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d10a33c68b8526d95ef6ee72b371c392d48df4d3;p=karo-tx-linux.git

drbd: Forcing primary should also work for Consistent disks [Bugz 266]

Up to now this only worked for Outdated and Inconsistent disks, that
it did not worked for Consistent disks was an inconsistent omission.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
---

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index d53d36cd0e57..6492e321ec00 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -285,8 +285,8 @@ int drbd_set_role(struct drbd_conf *mdev, enum drbd_role new_role, int force)
 		}
 
 		if (r == SS_NO_UP_TO_DATE_DISK && force &&
-		    (mdev->state.disk == D_INCONSISTENT ||
-		     mdev->state.disk == D_OUTDATED)) {
+		    (mdev->state.disk < D_UP_TO_DATE &&
+		     mdev->state.disk >= D_INCONSISTENT)) {
 			mask.disk = D_MASK;
 			val.disk  = D_UP_TO_DATE;
 			forced = 1;