diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2012-01-20 07:52:27 -0500 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:58:14 -0500 |
commit | 4d0fc3fdc3144b974888bb06efad69a0eb85719a (patch) | |
tree | e61262b8828ee4a6a7450908ab2470044ae5f9cf /drivers/block/drbd/drbd_int.h | |
parent | 1a3cde440615b0be304b3f92486c5c69ede4666b (diff) |
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_int.h')
-rw-r--r-- | drivers/block/drbd/drbd_int.h | 1 |
1 files changed, 1 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 { | |||
811 | SEND_PING, /* whether asender should send a ping asap */ | 811 | SEND_PING, /* whether asender should send a ping asap */ |
812 | SIGNAL_ASENDER, /* whether asender wants to be interrupted */ | 812 | SIGNAL_ASENDER, /* whether asender wants to be interrupted */ |
813 | GOT_PING_ACK, /* set when we receive a ping_ack packet, ping_wait gets woken */ | 813 | GOT_PING_ACK, /* set when we receive a ping_ack packet, ping_wait gets woken */ |
814 | CONN_WD_ST_CHG_REQ, /* A cluster wide state change on the connection is active */ | ||
814 | CONN_WD_ST_CHG_OKAY, | 815 | CONN_WD_ST_CHG_OKAY, |
815 | CONN_WD_ST_CHG_FAIL, | 816 | CONN_WD_ST_CHG_FAIL, |
816 | CONN_DRY_RUN, /* Expect disconnect after resync handshake. */ | 817 | CONN_DRY_RUN, /* Expect disconnect after resync handshake. */ |