summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-10-07 14:22:49 +1100
committerNeilBrown <neilb@suse.de>2011-10-07 14:22:49 +1100
commite4f869d9de18bc8272df8d0ab764178aa24bdf33 (patch)
tree9782f85edbecdb83dab65f2fab4390264b0d7139
parentce550c2059a67ee7834fc6f64cf895391d36a58e (diff)
downloadlinux-e4f869d9de18bc8272df8d0ab764178aa24bdf33.tar.bz2
md/raid5: remove pointless NULL test.
In the 'abort' branch of run(), 'conf' cannot possibly be NULL, so remove the test. Reported-by: Zdenek Kabelac <zdenek.kabelac@gmail.com> Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r--drivers/md/raid5.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index ac5e8b57e50f..6ab3434b2359 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -4942,10 +4942,8 @@ static int run(mddev_t *mddev)
return 0;
abort:
md_unregister_thread(&mddev->thread);
- if (conf) {
- print_raid5_conf(conf);
- free_conf(conf);
- }
+ print_raid5_conf(conf);
+ free_conf(conf);
mddev->private = NULL;
printk(KERN_ALERT "md/raid:%s: failed to run raid set.\n", mdname(mddev));
return -EIO;