Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Nick Andrew and committed by
Linus Torvalds
d7a420c9 4ef197d8

+8 -7
+2 -1
drivers/md/multipath.c
··· 244 244 conf->working_disks--; 245 245 mddev->degraded++; 246 246 printk(KERN_ALERT "multipath: IO failure on %s," 247 - " disabling IO path. \n Operation continuing" 247 + " disabling IO path.\n" 248 + "multipath: Operation continuing" 248 249 " on %d IO paths.\n", 249 250 bdevname (rdev->bdev,b), 250 251 conf->working_disks);
+2 -2
drivers/md/raid1.c
··· 1008 1008 } else 1009 1009 set_bit(Faulty, &rdev->flags); 1010 1010 set_bit(MD_CHANGE_DEVS, &mddev->flags); 1011 - printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n" 1012 - " Operation continuing on %d devices\n", 1011 + printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n" 1012 + "raid1: Operation continuing on %d devices.\n", 1013 1013 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); 1014 1014 } 1015 1015
+2 -2
drivers/md/raid10.c
··· 1001 1001 } 1002 1002 set_bit(Faulty, &rdev->flags); 1003 1003 set_bit(MD_CHANGE_DEVS, &mddev->flags); 1004 - printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n" 1005 - " Operation continuing on %d devices\n", 1004 + printk(KERN_ALERT "raid10: Disk failure on %s, disabling device.\n" 1005 + "raid10: Operation continuing on %d devices.\n", 1006 1006 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); 1007 1007 } 1008 1008
+2 -2
drivers/md/raid5.c
··· 1262 1262 } 1263 1263 set_bit(Faulty, &rdev->flags); 1264 1264 printk (KERN_ALERT 1265 - "raid5: Disk failure on %s, disabling device." 1266 - " Operation continuing on %d devices\n", 1265 + "raid5: Disk failure on %s, disabling device.\n" 1266 + "raid5: Operation continuing on %d devices.\n", 1267 1267 bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); 1268 1268 } 1269 1269 }