* [PATCH 1/2] RAID: Remove leading TAB on printk messages
@ 2008-04-11 8:06 Nick Andrew
2008-04-11 8:07 ` [PATCH 2/2] RAID: remove trailing space from printk line Nick Andrew
2008-04-12 16:24 ` [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
0 siblings, 2 replies; 3+ messages in thread
From: Nick Andrew @ 2008-04-11 8:06 UTC (permalink / raw
To: mingo, trivial, neilb; +Cc: linux-kernel, akpm
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>
---
drivers/md/multipath.c | 3 ++-
drivers/md/raid1.c | 4 ++--
drivers/md/raid10.c | 4 ++--
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 3f299d8..42ee1a2 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 ff61b30..9fd473a 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 32389d2..1e96aa3 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 c574cf5..88c2b60 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1260,8 +1260,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);
}
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] RAID: remove trailing space from printk line
2008-04-11 8:06 [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
@ 2008-04-11 8:07 ` Nick Andrew
2008-04-12 16:24 ` [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
1 sibling, 0 replies; 3+ messages in thread
From: Nick Andrew @ 2008-04-11 8:07 UTC (permalink / raw
To: mingo, trivial, neilb; +Cc: linux-kernel, akpm
RAID: remove trailing space from printk line
drivers/md/*.[ch] contains only one more printk line with a trailing space.
Remove it.
Signed-off-by: Nick Andrew <nick@nick-andrew.net>
---
drivers/md/md.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 61ccbd2..5ebfb4d 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4152,7 +4152,7 @@ static int hot_remove_disk(mddev_t * mddev, dev_t dev)
return 0;
busy:
- printk(KERN_WARNING "md: cannot remove active disk %s from %s ... \n",
+ printk(KERN_WARNING "md: cannot remove active disk %s from %s ...\n",
bdevname(rdev->bdev,b), mdname(mddev));
return -EBUSY;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] RAID: Remove leading TAB on printk messages
2008-04-11 8:06 [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
2008-04-11 8:07 ` [PATCH 2/2] RAID: remove trailing space from printk line Nick Andrew
@ 2008-04-12 16:24 ` Nick Andrew
1 sibling, 0 replies; 3+ messages in thread
From: Nick Andrew @ 2008-04-12 16:24 UTC (permalink / raw
To: mingo, trivial, neilb; +Cc: linux-kernel, akpm
On Fri, Apr 11, 2008 at 06:06:37PM +1000, Nick Andrew wrote:
> + printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n"
> + "raid1: Operation continuing on %d devices.\n",
Note: It wasn't known at the time, but the use of a multi-line string
in printk will cause one line to be emitted at KERN_ALERT level, and
the subsequent lines at default_message_loglevel, which is usually
something different.
My patch just posted in msg <20080412161733.24882.30930.stgit@marcab.local.tull.net>
resolves this problem.
Nick.
--
PGP Key ID = 0x418487E7 http://www.nick-andrew.net/
PGP Key fingerprint = B3ED 6894 8E49 1770 C24A 67E3 6266 6EB9 4184 87E7
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-04-12 16:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-11 8:06 [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
2008-04-11 8:07 ` [PATCH 2/2] RAID: remove trailing space from printk line Nick Andrew
2008-04-12 16:24 ` [PATCH 1/2] RAID: Remove leading TAB on printk messages Nick Andrew
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).