diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2015-10-29 12:01:34 +0100 |
|---|---|---|
| committer | Markus Pargmann <mpa@pengutronix.de> | 2016-02-05 08:52:31 +0100 |
| commit | 1f7b5cf1be4351e60cf8ae7aab976503dd73c5f8 (patch) | |
| tree | 18fd6dfe7ac100dde20758d667eec116386e3ef8 /drivers/block | |
| parent | 23272a6754b81ff6503e09c743bb4ceeeab39997 (diff) | |
| download | blackbird-op-linux-1f7b5cf1be4351e60cf8ae7aab976503dd73c5f8.tar.gz blackbird-op-linux-1f7b5cf1be4351e60cf8ae7aab976503dd73c5f8.zip | |
nbd: Timeouts are not user requested disconnects
It may be useful to know in the client that a connection timed out. The
current code returns success for a timeout.
This patch reports the error code -ETIMEDOUT for a timeout.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nbd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 438f4dc549db..2e14e51b5ea3 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -57,6 +57,7 @@ struct nbd_device { int blksize; loff_t bytesize; int xmit_timeout; + bool timedout; bool disconnect; /* a disconnect has been requested by user */ struct timer_list timeout_timer; @@ -154,10 +155,9 @@ static void nbd_xmit_timeout(unsigned long arg) if (list_empty(&nbd->queue_head)) return; - nbd->disconnect = true; - spin_lock_irqsave(&nbd->sock_lock, flags); + nbd->timedout = true; if (nbd->sock) kernel_sock_shutdown(nbd->sock, SHUT_RDWR); @@ -754,7 +754,10 @@ static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *nbd, if (max_part > 0) blkdev_reread_part(bdev); if (nbd->disconnect) /* user requested, ignore socket errors */ - return 0; + error = 0; + if (nbd->timedout) + error = -ETIMEDOUT; + return error; } |
