diff options
| author | Josef Bacik <jbacik@fb.com> | 2017-07-25 13:31:19 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-07-25 13:58:34 -0600 |
| commit | 7a362ea96d0df873397be04f4556e92f7e37c5ec (patch) | |
| tree | 5e781d1f34127a19e16f72be4b901a9c1582e8e5 /drivers/block | |
| parent | 76451d79bde6bed17e113f057e58e1fa5fb79e78 (diff) | |
| download | linux-7a362ea96d0df873397be04f4556e92f7e37c5ec.tar.bz2 | |
nbd: clear disconnected on reconnect
If our device loses its connection for longer than the dead timeout we
will set NBD_DISCONNECTED in order to quickly fail any pending IO's that
flood in after the IO's that were waiting during the dead timer.
However if we re-connect at some point in the future we'll still see
this DISCONNECTED flag set if we then lose our connection again after
that, which means we won't get notifications for our newly lost
connections. Fix this by just clearing the DISCONNECTED flag on
reconnect in order to make sure everything works as it's supposed to.
Reported-by: Dan Melnic <dmm@fb.com>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 64b19b10b739..5bdf923294a5 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -923,6 +923,8 @@ static int nbd_reconnect_socket(struct nbd_device *nbd, unsigned long arg) mutex_unlock(&nsock->tx_lock); sockfd_put(old); + clear_bit(NBD_DISCONNECTED, &config->runtime_flags); + /* We take the tx_mutex in an error path in the recv_work, so we * need to queue_work outside of the tx_mutex. */ |