From: Markus Pargmann <mpa@pengutronix.de>
To: nbd-general@lists.sourceforge.net
Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de,
Markus Pargmann <mpa@pengutronix.de>
Subject: [PATCH 02/10] nbd: restructure sock_shutdown
Date: Mon, 27 Jul 2015 09:12:48 +0200 [thread overview]
Message-ID: <1437981176-21061-3-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1437981176-21061-1-git-send-email-mpa@pengutronix.de>
This patch restructures sock_shutdown to avoid having the main code path
in an if block.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/block/nbd.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ff59093c5dc1..2c3661e4d364 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)
--
2.1.4
next prev parent reply other threads:[~2015-07-27 7:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-27 7:12 [PATCH 00/10] nbd updates Markus Pargmann
2015-07-27 7:12 ` [PATCH 01/10] nbd: sock_shutdown, remove conditional lock Markus Pargmann
2015-08-02 7:08 ` Pavel Machek
2015-07-27 7:12 ` Markus Pargmann [this message]
2015-08-02 7:08 ` [PATCH 02/10] nbd: restructure sock_shutdown Pavel Machek
2015-08-02 18:51 ` Markus Pargmann
2015-07-27 7:12 ` [PATCH 03/10] nbd: Remove 'harderror' and propagate error properly Markus Pargmann
2015-08-02 7:02 ` Pavel Machek
2015-07-27 7:12 ` [PATCH 04/10] nbd: Move clear queue debug message Markus Pargmann
2015-07-27 7:12 ` [PATCH 05/10] nbd: Remove variable 'pid' Markus Pargmann
2015-07-27 7:12 ` [PATCH 06/10] nbd: Add debugfs entries Markus Pargmann
2015-07-27 7:12 ` [PATCH 07/10] nbd: Change 'disconnect' to be boolean Markus Pargmann
2015-08-05 16:11 ` Pavel Machek
2015-07-27 7:12 ` [PATCH 08/10] nbd: Rename functions for clearness of recv/send path Markus Pargmann
2015-07-27 7:12 ` [PATCH 09/10] nbd: flags is a u32 variable Markus Pargmann
2015-07-27 7:12 ` [PATCH 10/10] nbd: Create size change events for userspace Markus Pargmann
2015-07-27 9:39 ` Markus Pargmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437981176-21061-3-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nbd-general@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®