Re: [PATCH 33/39] rbd: drop null test before destroy functions

[Ilya Dryomov]

On Sun, Sep 13, 2015 at 3:15 PM, Julia Lawall <Julia.Lawall@xxxxxxx> wrote:
> Remove unneeded NULL test.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@ expression x; @@
> -if (x != NULL) {
>   \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
>   x = NULL;
> -}
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx>
>
> ---
>  drivers/block/rbd.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index d93a037..0507246 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -5645,10 +5645,8 @@ static int rbd_slab_init(void)
>         if (rbd_segment_name_cache)
>                 return 0;
>  out_err:
> -       if (rbd_obj_request_cache) {
> -               kmem_cache_destroy(rbd_obj_request_cache);
> -               rbd_obj_request_cache = NULL;
> -       }
> +       kmem_cache_destroy(rbd_obj_request_cache);
> +       rbd_obj_request_cache = NULL;
>
>         kmem_cache_destroy(rbd_img_request_cache);
>         rbd_img_request_cache = NULL;

Applied.

Thanks,

                Ilya
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/