diff options
author | Jesper Juhl <juhl-lkml@dif.dk> | 2005-06-21 20:17:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 22:07:48 -0400 |
commit | 990a8baf568ca1d0ae65e59783ff821794118d07 (patch) | |
tree | 1fe187b2f119f7a9d96d56380b211f9ddb9f8390 /drivers/md/raid10.c | |
parent | 8a5e9cf1d6626586ff08e49f400a006a9f0c3275 (diff) |
[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: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r-- | drivers/md/raid10.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index fd7324a86d13..62ebb1bc72be 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
@@ -1737,8 +1737,7 @@ static int run(mddev_t *mddev) | |||
1737 | out_free_conf: | 1737 | out_free_conf: |
1738 | if (conf->r10bio_pool) | 1738 | if (conf->r10bio_pool) |
1739 | mempool_destroy(conf->r10bio_pool); | 1739 | mempool_destroy(conf->r10bio_pool); |
1740 | if (conf->mirrors) | 1740 | kfree(conf->mirrors); |
1741 | kfree(conf->mirrors); | ||
1742 | kfree(conf); | 1741 | kfree(conf); |
1743 | mddev->private = NULL; | 1742 | mddev->private = NULL; |
1744 | out: | 1743 | out: |
@@ -1754,8 +1753,7 @@ static int stop(mddev_t *mddev) | |||
1754 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ | 1753 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ |
1755 | if (conf->r10bio_pool) | 1754 | if (conf->r10bio_pool) |
1756 | mempool_destroy(conf->r10bio_pool); | 1755 | mempool_destroy(conf->r10bio_pool); |
1757 | if (conf->mirrors) | 1756 | kfree(conf->mirrors); |
1758 | kfree(conf->mirrors); | ||
1759 | kfree(conf); | 1757 | kfree(conf); |
1760 | mddev->private = NULL; | 1758 | mddev->private = NULL; |
1761 | return 0; | 1759 | return 0; |