diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2015-08-17 08:20:02 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-08-17 16:22:50 +0200 |
| commit | 260bbce403e2ac601b422fd926f48b9924051f92 (patch) | |
| tree | 9d45a6e7d0cc09949af095969cedbc50aa05614a | |
| parent | nbd: sock_shutdown, remove conditional lock (diff) | |
| download | linux-260bbce403e2ac601b422fd926f48b9924051f92.tar.xz linux-260bbce403e2ac601b422fd926f48b9924051f92.zip | |
nbd: restructure sock_shutdown
This patch restructures sock_shutdown to avoid having the main code path
in an if block.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | drivers/block/nbd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index bf0de3018cde..137b45f7f6c6 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -119,12 +119,13 @@ static void nbd_end_request(struct nbd_device *nbd, struct request *req) */ static void sock_shutdown(struct nbd_device *nbd) { - if (nbd->sock) { - 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); - } + 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) |