diff options
| author | NeilBrown <neilb@suse.de> | 2011-10-07 14:22:49 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-10-07 14:22:49 +1100 |
| commit | e4f869d9de18bc8272df8d0ab764178aa24bdf33 (patch) | |
| tree | 9782f85edbecdb83dab65f2fab4390264b0d7139 /drivers/md | |
| parent | ce550c2059a67ee7834fc6f64cf895391d36a58e (diff) | |
| download | linux-3.10-e4f869d9de18bc8272df8d0ab764178aa24bdf33.tar.gz linux-3.10-e4f869d9de18bc8272df8d0ab764178aa24bdf33.tar.bz2 linux-3.10-e4f869d9de18bc8272df8d0ab764178aa24bdf33.zip | |
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>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index ac5e8b57e50..6ab3434b235 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; |