Commit d7a420c9 authored by Nick Andrew's avatar Nick Andrew Committed by Linus Torvalds
Browse files

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: default avatarNick Andrew <nick@nick-andrew.net>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4ef197d8

drivers/md/multipath.c

+2 −1
Original line number Diff line number Diff line
@@ -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);

drivers/md/raid1.c

+2 −2
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ 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 "raid1: Disk failure on %s, disabling device.\n"

		"	Operation continuing on %d devices\n",

		"raid1: Operation continuing on %d devices.\n",

		bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);

}

drivers/md/raid10.c

+2 −2
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ 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",

		"raid10: Operation continuing on %d devices.\n",

		bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);

}

drivers/md/raid5.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE