From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbbHBSv6 (ORCPT ); Sun, 2 Aug 2015 14:51:58 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:59628 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbbHBSv5 (ORCPT ); Sun, 2 Aug 2015 14:51:57 -0400 Date: Sun, 2 Aug 2015 20:51:53 +0200 From: Markus Pargmann To: Pavel Machek 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: <20150802185153.GE19600@pengutronix.de> References: <1437981176-21061-1-git-send-email-mpa@pengutronix.de> <1437981176-21061-3-git-send-email-mpa@pengutronix.de> <20150802070844.GD32270@amd> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="BQPnanjtCNWHyqYD" Content-Disposition: inline In-Reply-To: <20150802070844.GD32270@amd> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 20:51:21 up 22:25, 32 users, load average: 0.76, 1.34, 0.85 User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --BQPnanjtCNWHyqYD Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Sun, Aug 02, 2015 at 09:08:44AM +0200, Pavel Machek wrote: > 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. > >=20 > > Signed-off-by: Markus Pargmann >=20 > Acked-by: Pavel Machek Thanks for the reviews. Best regards, Markus >=20 >=20 > > --- > > drivers/block/nbd.c | 13 +++++++------ > > 1 file changed, 7 insertions(+), 6 deletions(-) > >=20 > > 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 *nb= d, 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 =3D 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 =3D NULL; > > + del_timer_sync(&nbd->timeout_timer); > > } > > =20 > > static void nbd_xmit_timeout(unsigned long arg) >=20 > --=20 > (english) http://www.livejournal.com/~pavelmachek > (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/b= log.html >=20 --=20 Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | --BQPnanjtCNWHyqYD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVvmbJAAoJEEpcgKtcEGQQrh8P/3feQqSNEqUwA/AA5cjh5J6O vkqbsuqAj64K3Rc36iIb4me2X+84RO1f80rcXOZ+vXGyol2y5IINmpqeenToAQRX 1D4J6UB3XdirZs2cbTe3gN3vy9kaklWXusaK+rBH7O7Ofa+ocS8NV9xfACo6837N 63uknfbCXE9McJJTXx0NaC3kpHJoicx9GHH+tlohDqoWSKz8TDLzTQ5uRWfGa0iX uNyCjDQoFu39+daVGVkdPiWq/TxpqUHPvV1P4lEbX6/8155ucWntfB/Vcg1bb1ss rm+GZ1c5FljCdIAnIoJusNGoWJLEBeUHDBsc4lpXsD2fzkgeY4URmTyAMApgl0FT vLqKo7KHhX556dIzZMlS0JkxYKOIchWUiWl+OXajB/L8NrnDhs1A7XaLoQKIWVp3 npO1S+WvKQeR8TZMk4WxOQ9YkD4YTlsgyya14Eo8TEalJBzUbZYqTplwrzuuk7Qq aBFf0le+hTNCeRwoBkQfDqGhbAMbNOfxirIBZ68hp0lMNvAYk1S2QpLrjNJU0YWo sBIreHeNGNf2jewSpDeOXNHUi8YStUKwq1mRmt3Rjb4YkWFPn2YA7h9hh/2Msfgi Nnss7rsCp+q5JzQQ1ALyRZtWk8XvEF3O2lRt2mOXG5vCTOUue9vK/OwYYh3cpZ7X Dm2PC7mq4+m3O6JBRO9i =47vW -----END PGP SIGNATURE----- --BQPnanjtCNWHyqYD--