diff options
author | Nick Andrew <nick@nick-andrew.net> | 2008-04-28 05:15:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:42 -0400 |
commit | d7a420c9472a95c46600a0345434b7b166e0b9c7 (patch) | |
tree | b95005ce8ab92efdb5cd04b3d85c3b01a0455ebc /drivers | |
parent | 4ef197d87ad7d4bb326de3e9b8ecbb26f9e86253 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/md/multipath.c | 3 | ||||
-rw-r--r-- | drivers/md/raid1.c | 4 | ||||
-rw-r--r-- | drivers/md/raid10.c | 4 | ||||
-rw-r--r-- | drivers/md/raid5.c | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 3f299d835a2b..42ee1a2dc144 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) | |||
244 | conf->working_disks--; | 244 | conf->working_disks--; |
245 | mddev->degraded++; | 245 | mddev->degraded++; |
246 | printk(KERN_ALERT "multipath: IO failure on %s," | 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 | " on %d IO paths.\n", | 249 | " on %d IO paths.\n", |
249 | bdevname (rdev->bdev,b), | 250 | bdevname (rdev->bdev,b), |
250 | conf->working_disks); | 251 | conf->working_disks); |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index ff61b309129a..9fd473a6dbf5 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) | |||
1008 | } else | 1008 | } else |
1009 | set_bit(Faulty, &rdev->flags); | 1009 | set_bit(Faulty, &rdev->flags); |
1010 | set_bit(MD_CHANGE_DEVS, &mddev->flags); | 1010 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
1011 | printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n" | 1011 | printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n" |
1012 | " Operation continuing on %d devices\n", | 1012 | "raid1: Operation continuing on %d devices.\n", |
1013 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); | 1013 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); |
1014 | } | 1014 | } |
1015 | 1015 | ||
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 32389d2f18fc..1e96aa3ff513 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) | |||
1001 | } | 1001 | } |
1002 | set_bit(Faulty, &rdev->flags); | 1002 | set_bit(Faulty, &rdev->flags); |
1003 | set_bit(MD_CHANGE_DEVS, &mddev->flags); | 1003 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
1004 | printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n" | 1004 | printk(KERN_ALERT "raid10: Disk failure on %s, disabling device.\n" |
1005 | " Operation continuing on %d devices\n", | 1005 | "raid10: Operation continuing on %d devices.\n", |
1006 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); | 1006 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); |
1007 | } | 1007 | } |
1008 | 1008 | ||
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 9bc603181bcb..968dacaced6d 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) | |||
1262 | } | 1262 | } |
1263 | set_bit(Faulty, &rdev->flags); | 1263 | set_bit(Faulty, &rdev->flags); |
1264 | printk (KERN_ALERT | 1264 | printk (KERN_ALERT |
1265 | "raid5: Disk failure on %s, disabling device." | 1265 | "raid5: Disk failure on %s, disabling device.\n" |
1266 | " Operation continuing on %d devices\n", | 1266 | "raid5: Operation continuing on %d devices.\n", |
1267 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); | 1267 | bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded); |
1268 | } | 1268 | } |
1269 | } | 1269 | } |