nbd: correct disconnect behavior
authorPaul Clements <paul.clements@steeleye.com>
Wed, 3 Jul 2013 22:09:04 +0000 (15:09 -0700)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 27 Jul 2013 04:34:29 +0000 (05:34 +0100)
commitb5f8e9877feee4ae448f5d2294278548ac6a06ba
tree0cebb52c50aaaa7be00d29117cf70d3ef4ed606e
parentc8b425eba162f29a3544ad8d137194428a9e7411
nbd: correct disconnect behavior

commit c378f70adbc1bbecd9e6db145019f14b2f688c7c upstream.

Currently, when a disconnect is requested by the user (via NBD_DISCONNECT
ioctl) the return from NBD_DO_IT is undefined (it is usually one of
several error codes).  This means that nbd-client does not know if a
manual disconnect was performed or whether a network error occurred.
Because of this, nbd-client's persist mode (which tries to reconnect after
error, but not after manual disconnect) does not always work correctly.

This change fixes this by causing NBD_DO_IT to always return 0 if a user
requests a disconnect.  This means that nbd-client can correctly either
persist the connection (if an error occurred) or disconnect (if the user
requested it).

Signed-off-by: Paul Clements <paul.clements@steeleye.com>
Acked-by: Rob Landley <rob@landley.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2: adjust device pointer name]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/block/nbd.c
include/linux/nbd.h