diff options
| author | Philipp Reisner | 2012-01-20 13:52:27 +0100 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:14 +0100 |
| commit | 4d0fc3fdc3144b974888bb06efad69a0eb85719a (patch) | |
| tree | e61262b8828ee4a6a7450908ab2470044ae5f9cf /drivers/block/drbd/drbd_receiver.c | |
| parent | drbd: drbd_bm_ALe_set_all(): Remove unused function (diff) | |
| download | kernel-qcow2-linux-4d0fc3fdc3144b974888bb06efad69a0eb85719a.tar.gz kernel-qcow2-linux-4d0fc3fdc3144b974888bb06efad69a0eb85719a.tar.xz kernel-qcow2-linux-4d0fc3fdc3144b974888bb06efad69a0eb85719a.zip | |
drbd: Fixed compat issue with disconnecting 8.4 from a primary 8.3
For compatibility reasons 8.4 has to send P_STATE_CHG_REQ (instead
of P_CONN_ST_CHG_REQ) when disconnecting.
In the receiving code path we missed to convert the old
answer (P_STATE_CHG_REPLY) back to 8.4 logic. Therefore
the CL_ST_CHG_SUCCESS or CL_ST_CHG_FAIL bit in the flags word
of mdev got set, while the state code was waiting for
the CONN_WD_ST_CHG_OKAY or CONN_WD_ST_CHG_FAIL bits in tconn.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 { |