Re: [PATCH 02/10] nbd: restructure sock_shutdown

[Markus Pargmann <mpa@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 1840 bytes --]

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.
> > 
> > Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> 
> Acked-by: Pavel Machek <pavel@ucw.cz>

Thanks for the reviews.

Best regards,

Markus

> 
> 
> > ---
> >  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
> 

-- 
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 |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]