]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
nbd: only set sndtimeo if we have a timeout set
authorJosef Bacik <jbacik@fb.com>
Fri, 21 Jul 2017 14:48:15 +0000 (10:48 -0400)
committerJens Axboe <axboe@kernel.dk>
Sat, 22 Jul 2017 17:12:32 +0000 (11:12 -0600)
commita7ee8cf190ecc8f118f0b7839912564117524d85
tree94102d0ba3f4defefedc7914899b12a2acc91d97
parentb4b2aeccf0f0fa1fd356cc72eeda7a2c66c39904
nbd: only set sndtimeo if we have a timeout set

A user reported that he was getting immediate disconnects with my
sndtimeo patch applied.  This is because by default the OSS nbd client
doesn't set a timeout, so we end up setting the sndtimeo to 0, which of
course means we have send errors a lot.  Instead only set our sndtimeo
if the user specified a timeout, otherwise we'll just wait forever like
we did previously.

Fixes: dc88e34d69d8 ("nbd: set sk->sk_sndtimeo for our sockets")
Reported-by: Adam Borowski <kilobyte@angband.pl>
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/block/nbd.c