Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7b5cf1 authored by Markus Pargmann's avatar Markus Pargmann
Browse files

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: default avatarMarkus Pargmann <mpa@pengutronix.de>
parent 23272a67

drivers/block/nbd.c

+6 −3
Original line number Diff line number Diff line
@@ -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;

	}