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 <[email protected]>
Acked-by: Pavel Machek <[email protected]> > --- > 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 ------------------------------------------------------------------------------ _______________________________________________ Nbd-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nbd-general
