Commit 644df1a8 authored by Julia Lawall's avatar Julia Lawall Committed by NeilBrown

md: drop null test before destroy functions

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);
// </smpl>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarNeilBrown <neilb@suse.com>
parent d4929add
...@@ -470,8 +470,7 @@ static int multipath_run (struct mddev *mddev) ...@@ -470,8 +470,7 @@ static int multipath_run (struct mddev *mddev)
return 0; return 0;
out_free_conf: out_free_conf:
if (conf->pool) mempool_destroy(conf->pool);
mempool_destroy(conf->pool);
kfree(conf->multipaths); kfree(conf->multipaths);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
......
...@@ -2843,8 +2843,7 @@ static struct r1conf *setup_conf(struct mddev *mddev) ...@@ -2843,8 +2843,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
abort: abort:
if (conf) { if (conf) {
if (conf->r1bio_pool) mempool_destroy(conf->r1bio_pool);
mempool_destroy(conf->r1bio_pool);
kfree(conf->mirrors); kfree(conf->mirrors);
safe_put_page(conf->tmppage); safe_put_page(conf->tmppage);
kfree(conf->poolinfo); kfree(conf->poolinfo);
...@@ -2946,8 +2945,7 @@ static void raid1_free(struct mddev *mddev, void *priv) ...@@ -2946,8 +2945,7 @@ static void raid1_free(struct mddev *mddev, void *priv)
{ {
struct r1conf *conf = priv; struct r1conf *conf = priv;
if (conf->r1bio_pool) mempool_destroy(conf->r1bio_pool);
mempool_destroy(conf->r1bio_pool);
kfree(conf->mirrors); kfree(conf->mirrors);
safe_put_page(conf->tmppage); safe_put_page(conf->tmppage);
kfree(conf->poolinfo); kfree(conf->poolinfo);
......
...@@ -3486,8 +3486,7 @@ static struct r10conf *setup_conf(struct mddev *mddev) ...@@ -3486,8 +3486,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)
printk(KERN_ERR "md/raid10:%s: couldn't allocate memory.\n", printk(KERN_ERR "md/raid10:%s: couldn't allocate memory.\n",
mdname(mddev)); mdname(mddev));
if (conf) { if (conf) {
if (conf->r10bio_pool) mempool_destroy(conf->r10bio_pool);
mempool_destroy(conf->r10bio_pool);
kfree(conf->mirrors); kfree(conf->mirrors);
safe_put_page(conf->tmppage); safe_put_page(conf->tmppage);
kfree(conf); kfree(conf);
...@@ -3682,8 +3681,7 @@ static int run(struct mddev *mddev) ...@@ -3682,8 +3681,7 @@ static int run(struct mddev *mddev)
out_free_conf: out_free_conf:
md_unregister_thread(&mddev->thread); md_unregister_thread(&mddev->thread);
if (conf->r10bio_pool) mempool_destroy(conf->r10bio_pool);
mempool_destroy(conf->r10bio_pool);
safe_put_page(conf->tmppage); safe_put_page(conf->tmppage);
kfree(conf->mirrors); kfree(conf->mirrors);
kfree(conf); kfree(conf);
...@@ -3696,8 +3694,7 @@ static void raid10_free(struct mddev *mddev, void *priv) ...@@ -3696,8 +3694,7 @@ static void raid10_free(struct mddev *mddev, void *priv)
{ {
struct r10conf *conf = priv; struct r10conf *conf = priv;
if (conf->r10bio_pool) mempool_destroy(conf->r10bio_pool);
mempool_destroy(conf->r10bio_pool);
safe_put_page(conf->tmppage); safe_put_page(conf->tmppage);
kfree(conf->mirrors); kfree(conf->mirrors);
kfree(conf->mirrors_old); kfree(conf->mirrors_old);
......
...@@ -2271,8 +2271,7 @@ static void shrink_stripes(struct r5conf *conf) ...@@ -2271,8 +2271,7 @@ static void shrink_stripes(struct r5conf *conf)
drop_one_stripe(conf)) drop_one_stripe(conf))
; ;
if (conf->slab_cache) kmem_cache_destroy(conf->slab_cache);
kmem_cache_destroy(conf->slab_cache);
conf->slab_cache = NULL; conf->slab_cache = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment