From b73a7a01dadc69bb7d8bb474c7540bb5684def76 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Mon, 22 Nov 2010 14:18:47 +0100 Subject: [PATCH] --- yaml --- r: 242835 b: refs/heads/master c: 1fc80cf37810d6b00cac27a219b8ecab2010adac h: refs/heads/master i: 242833: 5dae9779fa84c3acd8de61e43349956297d87dc3 242831: 45b6f24b7f1e3fc6f3f1fc6c9025f884aa4ce691 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_main.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 389f0f2664fe..d165b6c3228c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3719094ec2dec411b3151f10048316d787e086f9 +refs/heads/master: 1fc80cf37810d6b00cac27a219b8ecab2010adac diff --git a/trunk/drivers/block/drbd/drbd_main.c b/trunk/drivers/block/drbd/drbd_main.c index 14afbd4e53a5..8b8a38dc6492 100644 --- a/trunk/drivers/block/drbd/drbd_main.c +++ b/trunk/drivers/block/drbd/drbd_main.c @@ -800,6 +800,10 @@ static int is_valid_state_transition(struct drbd_conf *mdev, os.conn < C_CONNECTED) rv = SS_NEED_CONNECTION; + if ((ns.conn == C_SYNC_TARGET || ns.conn == C_SYNC_SOURCE) + && os.conn < C_WF_REPORT_PARAMS) + rv = SS_NEED_CONNECTION; /* No NetworkFailure -> SyncTarget etc... */ + return rv; }