Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 067032bc authored Jan 14, 2011 by Joe Perches Committed by NeilBrown Jan 14, 2011

md: Fix single printks with multiple KERN_<level>s



Noticed-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: NeilBrown <neilb@suse.de>

parent 6c987910

drivers/md/raid1.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1027,8 +1027,9 @@ 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 "md/raid1:%s: Disk failure on %s, disabling device.\n"
		KERN_ALERT "md/raid1:%s: Operation continuing on %d devices.\n",
		printk(KERN_ALERT
		"md/raid1:%s: Disk failure on %s, disabling device.\n"
		"md/raid1:%s: Operation continuing on %d devices.\n",
		mdname(mddev), bdevname(rdev->bdev, b),
		mdname(mddev), conf->raid_disks - mddev->degraded);
		}

drivers/md/raid10.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -1051,8 +1051,9 @@ 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 "md/raid10:%s: Disk failure on %s, disabling device.\n"
		KERN_ALERT "md/raid10:%s: Operation continuing on %d devices.\n",
		printk(KERN_ALERT
		"md/raid10:%s: Disk failure on %s, disabling device.\n"
		"md/raid10:%s: Operation continuing on %d devices.\n",
		mdname(mddev), bdevname(rdev->bdev, b),
		mdname(mddev), conf->raid_disks - mddev->degraded);
		}

drivers/md/raid5.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -1721,7 +1721,6 @@ static void error(mddev_t mddev, mdk_rdev_t rdev)
		set_bit(Faulty, &rdev->flags);
		printk(KERN_ALERT
		"md/raid:%s: Disk failure on %s, disabling device.\n"
		KERN_ALERT
		"md/raid:%s: Operation continuing on %d devices.\n",
		mdname(mddev),
		bdevname(rdev->bdev, b),