3 files changed, 9 insertions, 0 deletions

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 8001b7a2063b..e8461f8cb046 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -811,6 +811,7 @@ enum {
         SEND_PING,              /* whether asender should send a ping asap */
         SIGNAL_ASENDER,         /* whether asender wants to be interrupted */
         GOT_PING_ACK,           /* set when we receive a ping_ack packet, ping_wait gets woken */
+        CONN_WD_ST_CHG_REQ,     /* A cluster wide state change on the connection is active */
         CONN_WD_ST_CHG_OKAY,
         CONN_WD_ST_CHG_FAIL,
         CONN_DRY_RUN,           /* Expect disconnect after resync handshake. */
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index c8d3f38d539f..9b83f88c0e82 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -4827,6 +4827,11 @@ static int got_RqSReply(struct drbd_tconn *tconn, struct packet_info *pi)
         if (!mdev)
                 return -EIO;
 
+        if (test_bit(CONN_WD_ST_CHG_REQ, &tconn->flags)) {
+                D_ASSERT(tconn->agreed_pro_version < 100);
+                return got_conn_RqSReply(tconn, pi);
+        }
+
         if (retcode >= SS_SUCCESS) {
                 set_bit(CL_ST_CHG_SUCCESS, &mdev->flags);
         } else {
diff --git a/drivers/block/drbd/drbd_state.c b/drivers/block/drbd/drbd_state.c
index 70aa9603e368..05ed131a5a87 100644
--- a/drivers/block/drbd/drbd_state.c
+++ b/drivers/block/drbd/drbd_state.c
@@ -1671,7 +1671,9 @@ conn_cl_wide(struct drbd_tconn *tconn, union drbd_state mask, union drbd_state v
         spin_unlock_irq(&tconn->req_lock);
         mutex_lock(&tconn->cstate_mutex);
 
+        set_bit(CONN_WD_ST_CHG_REQ, &tconn->flags);
         if (conn_send_state_req(tconn, mask, val)) {
+                clear_bit(CONN_WD_ST_CHG_REQ, &tconn->flags);
                 rv = SS_CW_FAILED_BY_PEER;
                 /* if (f & CS_VERBOSE)
                    print_st_err(mdev, os, ns, rv); */
@@ -1679,6 +1681,7 @@ conn_cl_wide(struct drbd_tconn *tconn, union drbd_state mask, union drbd_state v
         }
 
         wait_event(tconn->ping_wait, (rv = _conn_rq_cond(tconn, mask, val)));
+        clear_bit(CONN_WD_ST_CHG_REQ, &tconn->flags);
 
 abort:
         mutex_unlock(&tconn->cstate_mutex);