From 3814ee80d1ed3c648cc8a615b5de9f9bcb86170b Mon Sep 17 00:00:00 2001 From: Lars Ellenberg Date: Mon, 5 Nov 2012 11:54:30 +0100 Subject: [PATCH] --- yaml --- r: 346277 b: refs/heads/master c: ed635cb0674d6e4303d1a2e27d9e6e80b451a338 h: refs/heads/master i: 346275: c3bd0a8d46f11a66e8745745b099cfbfff7e14c9 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9c38ca2e155..4141647a790c 100644 --- 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 index 9a9d4fd264a9..1599a1a6f1f7 100644 --- 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; }