linux-kernel - Re: [PATCH 02/10] nbd: restructure sock

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150802070844.GD32270@amd>
Date:	Sun, 2 Aug 2015 09:08:44 +0200
From:	Pavel Machek <pavel@....cz>
To:	Markus Pargmann <mpa@...gutronix.de>
Cc:	nbd-general@...ts.sourceforge.net, linux-kernel@...r.kernel.org,
	kernel@...gutronix.de
Subject: Re: [PATCH 02/10] nbd: restructure sock_shutdown

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@...gutronix.de>

Acked-by: Pavel Machek <pavel@....cz>


> ---
>  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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/