Commit ff57dc94 authored Nov 06, 2017 by Josef Bacik Committed by Jens Axboe Nov 06, 2017

nbd: wait uninterruptible for the dead timeout



If we have a pending signal or the user kills their application then
it'll bring down the whole device, which is less than awesome.  Instead
wait uninterruptible for the dead timeout so we're sure we gave it our
best shot.

Fixes: 560bc4b3 ("nbd: handle dead connections")
Cc: stable@vger.kernel.org
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent 923218f6

drivers/block/nbd.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -715,7 +715,7 @@ static int wait_for_reconnect(struct nbd_device *nbd)
		return 0;
		if (test_bit(NBD_DISCONNECTED, &config->runtime_flags))
		return 0;
		wait_event_interruptible_timeout(config->conn_wait,
		wait_event_timeout(config->conn_wait,
		atomic_read(&config->live_connections),
		config->dead_conn_timeout);
		return atomic_read(&config->live_connections);

Admin message