From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751931AbbHBHIq (ORCPT ); Sun, 2 Aug 2015 03:08:46 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:46817 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751519AbbHBHIp (ORCPT ); Sun, 2 Aug 2015 03:08:45 -0400 Date: Sun, 2 Aug 2015 09:08:44 +0200 From: Pavel Machek To: Markus Pargmann Cc: nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH 02/10] nbd: restructure sock_shutdown Message-ID: <20150802070844.GD32270@amd> References: <1437981176-21061-1-git-send-email-mpa@pengutronix.de> <1437981176-21061-3-git-send-email-mpa@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437981176-21061-3-git-send-email-mpa@pengutronix.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon 2015-07-27 09:12:48, Markus Pargmann wrote: > This patch restructures sock_shutdown to avoid having the main code path > in an if block. > > Signed-off-by: Markus Pargmann Acked-by: Pavel Machek > --- > 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) -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html