From: Andre Noll <maan@systemlinux.org>
Date: Tue, 25 Mar 2008 23:07:03 +0000 (+0100)
Subject: md: do_md_run(): Fix misleading error message.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13e53df354caea8986df951dcb6353c823e1f858;p=linux-beck.git

md: do_md_run(): Fix misleading error message.

In case pers->run() succeeds but creating the bitmap fails, we
print an error message stating that pers->run() has failed.

Print this message only if pers->run() really failed.

Signed-off-by: Andre Noll <maan@systemlinux.org>
Signed-off-by: Neil Brown <neilb@suse.de>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 80bcba9951c3..b9d902652a51 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3675,7 +3675,9 @@ static int do_md_run(mddev_t * mddev)
 		mddev->ro = 2; /* read-only, but switch on first write */
 
 	err = mddev->pers->run(mddev);
-	if (!err && mddev->pers->sync_request) {
+	if (err)
+		printk(KERN_ERR "md: pers->run() failed ...\n");
+	else if (mddev->pers->sync_request) {
 		err = bitmap_create(mddev);
 		if (err) {
 			printk(KERN_ERR "%s: failed to create bitmap (%d)\n",
@@ -3684,7 +3686,6 @@ static int do_md_run(mddev_t * mddev)
 		}
 	}
 	if (err) {
-		printk(KERN_ERR "md: pers->run() failed ...\n");
 		module_put(mddev->pers->owner);
 		mddev->pers = NULL;
 		bitmap_destroy(mddev);