---

yaml
---
r: 251279
b: refs/heads/master
c: 21423fa
h: refs/heads/master
i:
  251277: 29f7d04
  251275: e16d028
  251271: 7712340
  251263: b48118c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa7d939663b61f5c2bd3436d3aa126d4c0f47aa8
+refs/heads/master: 21423fa79119a80e335de0c82ec29f67ed59f1bc

trunk/drivers/block/drbd/drbd_nl.c

@@ -272,9 +272,22 @@ static int _try_outdate_peer_async(void *data)
 {
 	struct drbd_conf *mdev = (struct drbd_conf *)data;
 	enum drbd_disk_state nps;
+	union drbd_state ns;
 
 	nps = drbd_try_outdate_peer(mdev);
-	drbd_request_state(mdev, NS(pdsk, nps));
+
+	/* Not using
+	   drbd_request_state(mdev, NS(pdsk, nps));
+	   here, because we might were able to re-establish the connection in the
+	   meantime.
+	*/
+	spin_lock_irq(&mdev->req_lock);
+	ns = mdev->state;
+	if (ns.conn < C_WF_REPORT_PARAMS) {
+		ns.pdsk = nps;
+		_drbd_set_state(mdev, ns, CS_VERBOSE, NULL);
+	}
+	spin_unlock_irq(&mdev->req_lock);
 
 	return 0;
 }