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

Commit 260bbce4 authored by Markus Pargmann's avatar Markus Pargmann Committed by Jens Axboe
Browse files

nbd: restructure sock_shutdown 



This patch restructures sock_shutdown to avoid having the main code path
in an if block.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 36e47bee

drivers/block/nbd.c

+7 −6
Original line number Diff line number Diff line
@@ -119,13 +119,14 @@ static void nbd_end_request(struct nbd_device *nbd, struct request *req) 
 */

static void sock_shutdown(struct nbd_device *nbd)

{

	if (nbd->sock) {

	if (!nbd->sock)

		return;



	dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n");

	kernel_sock_shutdown(nbd->sock, SHUT_RDWR);

	nbd->sock = NULL;

	del_timer_sync(&nbd->timeout_timer);

}

}



static void nbd_xmit_timeout(unsigned long arg)

{