Commit 990a8baf authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds

[PATCH] md: remove unneeded NULL checks before kfree

This patch removes some unneeded checks of pointers being NULL before
calling kfree() on them.  kfree() handles NULL pointers just fine, checking
first is pointless.
Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8a5e9cf1
...@@ -704,7 +704,6 @@ static void crypt_dtr(struct dm_target *ti) ...@@ -704,7 +704,6 @@ static void crypt_dtr(struct dm_target *ti)
mempool_destroy(cc->page_pool); mempool_destroy(cc->page_pool);
mempool_destroy(cc->io_pool); mempool_destroy(cc->io_pool);
if (cc->iv_mode)
kfree(cc->iv_mode); kfree(cc->iv_mode);
if (cc->iv_gen_ops && cc->iv_gen_ops->dtr) if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
cc->iv_gen_ops->dtr(cc); cc->iv_gen_ops->dtr(cc);
......
...@@ -217,7 +217,6 @@ static int linear_run (mddev_t *mddev) ...@@ -217,7 +217,6 @@ static int linear_run (mddev_t *mddev)
return 0; return 0;
out: out:
if (conf)
kfree(conf); kfree(conf);
return 1; return 1;
} }
......
...@@ -195,7 +195,6 @@ static mddev_t * mddev_find(dev_t unit) ...@@ -195,7 +195,6 @@ static mddev_t * mddev_find(dev_t unit)
if (mddev->unit == unit) { if (mddev->unit == unit) {
mddev_get(mddev); mddev_get(mddev);
spin_unlock(&all_mddevs_lock); spin_unlock(&all_mddevs_lock);
if (new)
kfree(new); kfree(new);
return mddev; return mddev;
} }
...@@ -458,11 +457,8 @@ static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) ...@@ -458,11 +457,8 @@ static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2)
ret = 1; ret = 1;
abort: abort:
if (tmp1)
kfree(tmp1); kfree(tmp1);
if (tmp2)
kfree(tmp2); kfree(tmp2);
return ret; return ret;
} }
......
...@@ -533,7 +533,6 @@ static int multipath_run (mddev_t *mddev) ...@@ -533,7 +533,6 @@ static int multipath_run (mddev_t *mddev)
out_free_conf: out_free_conf:
if (conf->pool) if (conf->pool)
mempool_destroy(conf->pool); mempool_destroy(conf->pool);
if (conf->multipaths)
kfree(conf->multipaths); kfree(conf->multipaths);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
......
...@@ -371,10 +371,8 @@ static int raid0_run (mddev_t *mddev) ...@@ -371,10 +371,8 @@ static int raid0_run (mddev_t *mddev)
return 0; return 0;
out_free_conf: out_free_conf:
if (conf->strip_zone)
kfree(conf->strip_zone); kfree(conf->strip_zone);
if (conf->devlist) kfree(conf->devlist);
kfree (conf->devlist);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
out: out:
...@@ -386,11 +384,11 @@ static int raid0_stop (mddev_t *mddev) ...@@ -386,11 +384,11 @@ static int raid0_stop (mddev_t *mddev)
raid0_conf_t *conf = mddev_to_conf(mddev); raid0_conf_t *conf = mddev_to_conf(mddev);
blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
kfree (conf->hash_table); kfree(conf->hash_table);
conf->hash_table = NULL; conf->hash_table = NULL;
kfree (conf->strip_zone); kfree(conf->strip_zone);
conf->strip_zone = NULL; conf->strip_zone = NULL;
kfree (conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
return 0; return 0;
......
...@@ -1427,9 +1427,7 @@ static int run(mddev_t *mddev) ...@@ -1427,9 +1427,7 @@ static int run(mddev_t *mddev)
if (conf) { if (conf) {
if (conf->r1bio_pool) if (conf->r1bio_pool)
mempool_destroy(conf->r1bio_pool); mempool_destroy(conf->r1bio_pool);
if (conf->mirrors)
kfree(conf->mirrors); kfree(conf->mirrors);
if (conf->poolinfo)
kfree(conf->poolinfo); kfree(conf->poolinfo);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
...@@ -1447,9 +1445,7 @@ static int stop(mddev_t *mddev) ...@@ -1447,9 +1445,7 @@ static int stop(mddev_t *mddev)
blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
if (conf->r1bio_pool) if (conf->r1bio_pool)
mempool_destroy(conf->r1bio_pool); mempool_destroy(conf->r1bio_pool);
if (conf->mirrors)
kfree(conf->mirrors); kfree(conf->mirrors);
if (conf->poolinfo)
kfree(conf->poolinfo); kfree(conf->poolinfo);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
......
...@@ -1737,7 +1737,6 @@ static int run(mddev_t *mddev) ...@@ -1737,7 +1737,6 @@ static int run(mddev_t *mddev)
out_free_conf: out_free_conf:
if (conf->r10bio_pool) if (conf->r10bio_pool)
mempool_destroy(conf->r10bio_pool); mempool_destroy(conf->r10bio_pool);
if (conf->mirrors)
kfree(conf->mirrors); kfree(conf->mirrors);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = NULL;
...@@ -1754,7 +1753,6 @@ static int stop(mddev_t *mddev) ...@@ -1754,7 +1753,6 @@ static int stop(mddev_t *mddev)
blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
if (conf->r10bio_pool) if (conf->r10bio_pool)
mempool_destroy(conf->r10bio_pool); mempool_destroy(conf->r10bio_pool);
if (conf->mirrors)
kfree(conf->mirrors); kfree(conf->mirrors);
kfree(conf); kfree(conf);
mddev->private = NULL; mddev->private = 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