aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/drbd/drbd_main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 11d8ff6016ac..157d1e4343c2 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -867,10 +867,9 @@ static union drbd_state sanitize_state(struct drbd_conf *mdev, union drbd_state
867 } 867 }
868 868
869 if (fp == FP_STONITH && 869 if (fp == FP_STONITH &&
870 (ns.role == R_PRIMARY && 870 (ns.role == R_PRIMARY && ns.conn < C_CONNECTED && ns.pdsk > D_OUTDATED) &&
871 ns.conn < C_CONNECTED && 871 !(os.role == R_PRIMARY && os.conn < C_CONNECTED && os.pdsk > D_OUTDATED))
872 ns.pdsk > D_OUTDATED)) 872 ns.susp = 1;
873 ns.susp = 1;
874 873
875 if (ns.aftr_isp || ns.peer_isp || ns.user_isp) { 874 if (ns.aftr_isp || ns.peer_isp || ns.user_isp) {
876 if (ns.conn == C_SYNC_SOURCE) 875 if (ns.conn == C_SYNC_SOURCE)