raid: remove leading TAB on printk messages

MD drivers use one printk() call to print 2 log messages and the second line
may be prefixed by a TAB character.  It may also output a trailing space
before newline.  klogd (I think) turns the TAB character into the 2 characters
'^I' when logging to a file.  This looks ugly.

Instead of a leading TAB to indicate continuation, prefix both output lines
with 'raid:' or similar.  Also remove any trailing space in the vicinity of
the affected code and consistently end the sentences with a period.

Signed-off-by: Nick Andrew <nick@nick-andrew.net>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

4 files changed, 8 insertions, 7 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 3f299d835a2..42ee1a2dc14 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -244,7 +244,8 @@ static void multipath_error (mddev_t *mddev, mdk_rdev_t *rdev)
                         conf->working_disks--;
                         mddev->degraded++;
                         printk(KERN_ALERT "multipath: IO failure on %s,"
-                                " disabling IO path. \n Operation continuing"
+                                " disabling IO path.\n"
+                                "multipath: Operation continuing"
                                 " on %d IO paths.\n",
                                 bdevname (rdev->bdev,b),
                                 conf->working_disks);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index ff61b309129..9fd473a6dbf 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1008,8 +1008,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         } else
                 set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n"
-                "       Operation continuing on %d devices\n",
+        printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n"
+                "raid1: Operation continuing on %d devices.\n",
                 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 32389d2f18f..1e96aa3ff51 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1001,8 +1001,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
         }
         set_bit(Faulty, &rdev->flags);
         set_bit(MD_CHANGE_DEVS, &mddev->flags);
-        printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n"
-                "       Operation continuing on %d devices\n",
+        printk(KERN_ALERT "raid10: Disk failure on %s, disabling device.\n"
+                "raid10: Operation continuing on %d devices.\n",
                 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
 }
 
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 9bc603181bc..968dacaced6 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1262,8 +1262,8 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
                 }
                 set_bit(Faulty, &rdev->flags);
                 printk (KERN_ALERT
-                        "raid5: Disk failure on %s, disabling device."
-                        " Operation continuing on %d devices\n",
+                        "raid5: Disk failure on %s, disabling device.\n"
+                        "raid5: Operation continuing on %d devices.\n",
                         bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
         }
 }