Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

nbd: wait uninterruptible for the dead timeout

Browse Source 
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: 560bc4b399 ("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>
This commit is contained in:
Josef Bacik 2017-11-06 16:11:57 -05:00 committed by Jens Axboe
parent 923218f616
commit ff57dc94fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/block/nbd.c
View File

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