diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2012-08-04 01:07:55 +0200 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-09 14:05:47 +0100 |
| commit | e959d08d3ef6e48bc3b726bcc07a4ebb9989be94 (patch) | |
| tree | df3abd787e46ed66c1bdfe1a2be1f8b256c54988 /drivers/block/drbd | |
| parent | 519b6d3eac823e4ceec10484bc06f239047cebbf (diff) | |
| download | linux-3.10-e959d08d3ef6e48bc3b726bcc07a4ebb9989be94.tar.gz linux-3.10-e959d08d3ef6e48bc3b726bcc07a4ebb9989be94.tar.bz2 linux-3.10-e959d08d3ef6e48bc3b726bcc07a4ebb9989be94.zip | |
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: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_receiver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index 26c30fd64ec..d507700df85 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -901,8 +901,6 @@ static int conn_connect(struct drbd_tconn *tconn) msock.rbuf = tconn->meta.rbuf; msock.socket = NULL; - clear_bit(DISCARD_CONCURRENT, &tconn->flags); - /* Assume that the peer only understands protocol 80 until we know better. */ tconn->agreed_pro_version = 80; @@ -918,6 +916,7 @@ static int conn_connect(struct drbd_tconn *tconn) sock.socket = s; send_first_packet(tconn, &sock, P_INITIAL_DATA); } else if (!msock.socket) { + clear_bit(DISCARD_CONCURRENT, &tconn->flags); msock.socket = s; send_first_packet(tconn, &msock, P_INITIAL_META); } else { |