---

yaml --- r: 346277 b: refs/heads/master c: ed635cb h: refs/heads/master i: 346275: c3bd0a8 v: v3
git-mirror · Nov 9, 2012 · 3814ee8 · 3814ee8
1 parent 484c4ef
commit 3814ee8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 063eacf88cc1394ece125d106c05cba1ca03aa3d
+refs/heads/master: ed635cb0674d6e4303d1a2e27d9e6e80b451a338
diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c
@@ -1051,7 +1051,7 @@ static int conn_connect(struct drbd_tconn *tconn)
 	rcu_read_unlock();
 
 	rv = conn_request_state(tconn, NS(conn, C_WF_REPORT_PARAMS), CS_VERBOSE);
-	if (rv < SS_SUCCESS) {
+	if (rv < SS_SUCCESS || tconn->cstate != C_WF_REPORT_PARAMS) {
 		clear_bit(STATE_SENT, &tconn->flags);
 		return 0;
 	}