Commit e959d08d authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner

drbd: Fix a potential issue with the DISCARD_CONCURRENT flag

The DISCARD_CONCURRENT flag should be set on one node and cleared on the
other node.
As the code was before it was theoretical possible that a node accepts the
meta socket, but has to close it later on, and keeps the DISCARD_CONCURRENT
flag.
Correct this by moving the clear_bit(DISCARD_CONCURRENT) where the packet
gets sent.
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 519b6d3e
...@@ -901,8 +901,6 @@ static int conn_connect(struct drbd_tconn *tconn) ...@@ -901,8 +901,6 @@ static int conn_connect(struct drbd_tconn *tconn)
msock.rbuf = tconn->meta.rbuf; msock.rbuf = tconn->meta.rbuf;
msock.socket = NULL; msock.socket = NULL;
clear_bit(DISCARD_CONCURRENT, &tconn->flags);
/* Assume that the peer only understands protocol 80 until we know better. */ /* Assume that the peer only understands protocol 80 until we know better. */
tconn->agreed_pro_version = 80; tconn->agreed_pro_version = 80;
...@@ -918,6 +916,7 @@ static int conn_connect(struct drbd_tconn *tconn) ...@@ -918,6 +916,7 @@ static int conn_connect(struct drbd_tconn *tconn)
sock.socket = s; sock.socket = s;
send_first_packet(tconn, &sock, P_INITIAL_DATA); send_first_packet(tconn, &sock, P_INITIAL_DATA);
} else if (!msock.socket) { } else if (!msock.socket) {
clear_bit(DISCARD_CONCURRENT, &tconn->flags);
msock.socket = s; msock.socket = s;
send_first_packet(tconn, &msock, P_INITIAL_META); send_first_packet(tconn, &msock, P_INITIAL_META);
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment