---

yaml --- r: 242835 b: refs/heads/master c: 1fc80cf h: refs/heads/master i: 242833: 5dae977 242831: 45b6f24 v: v3
git-mirror · Mar 10, 2011 · b73a7a0 · b73a7a0
1 parent 47f44c2
commit b73a7a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;
 }