| Message ID | 1442146532-9100-34-git-send-email-Julia.Lawall@lip6.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Sep 13, 2015 at 3:15 PM, Julia Lawall <Julia.Lawall@lip6.fr> 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@lip6.fr> > > --- > 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 ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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@lip6.fr> --- drivers/block/rbd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html