md/raid1: improve printk messages

Make sure the array name is included in a uniform way in all printk
messages.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 29 insertions, 28 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index cb2da87ad593..1db02c4955a9 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -296,7 +296,8 @@ static void raid1_end_read_request(struct bio *bio, int error)
                  */
                 char b[BDEVNAME_SIZE];
                 if (printk_ratelimit())
-                        printk(KERN_ERR "raid1: %s: rescheduling sector %llu\n",
+                        printk(KERN_ERR "md/raid1:%s: %s: rescheduling sector %llu\n",
+                               mdname(conf->mddev),
                                bdevname(conf->mirrors[mirror].rdev->bdev,b), (unsigned long long)r1_bio->sector);
                 reschedule_retry(r1_bio);
         }
@@ -1075,21 +1076,22 @@ 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"
-                "raid1: Operation continuing on %d devices.\n",
-                bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
+        printk(KERN_ALERT "md/raid1:%s: Disk failure on %s, disabling device.\n"
+               KERN_ALERT "md/raid1:%s: Operation continuing on %d devices.\n",
+               mdname(mddev), bdevname(rdev->bdev, b),
+               mdname(mddev), conf->raid_disks - mddev->degraded);
 }
 
 static void print_conf(conf_t *conf)
 {
         int i;
 
-        printk("RAID1 conf printout:\n");
+        printk(KERN_DEBUG "RAID1 conf printout:\n");
         if (!conf) {
-                printk("(!conf)\n");
+                printk(KERN_DEBUG "(!conf)\n");
                 return;
         }
-        printk(" --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
+        printk(KERN_DEBUG " --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
                 conf->raid_disks);
 
         rcu_read_lock();
@@ -1097,7 +1099,7 @@ static void print_conf(conf_t *conf)
                 char b[BDEVNAME_SIZE];
                 mdk_rdev_t *rdev = rcu_dereference(conf->mirrors[i].rdev);
                 if (rdev)
-                        printk(" disk %d, wo:%d, o:%d, dev:%s\n",
+                        printk(KERN_DEBUG " disk %d, wo:%d, o:%d, dev:%s\n",
                                i, !test_bit(In_sync, &rdev->flags),
                                !test_bit(Faulty, &rdev->flags),
                                bdevname(rdev->bdev,b));
@@ -1458,9 +1460,10 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
                                 char b[BDEVNAME_SIZE];
                                 /* Cannot read from anywhere, array is toast */
                                 md_error(mddev, conf->mirrors[r1_bio->read_disk].rdev);
-                                printk(KERN_ALERT "raid1: %s: unrecoverable I/O read error"
+                                printk(KERN_ALERT "md/raid1:%s: %s: unrecoverable I/O read error"
                                        " for block %llu\n",
-                                       bdevname(bio->bi_bdev,b),
+                                       mdname(mddev),
+                                       bdevname(bio->bi_bdev, b),
                                        (unsigned long long)r1_bio->sector);
                                 md_done_sync(mddev, r1_bio->sectors, 0);
                                 put_buf(r1_bio);
@@ -1582,7 +1585,7 @@ static void fix_read_error(conf_t *conf, int read_disk,
                                 else {
                                         atomic_add(s, &rdev->corrected_errors);
                                         printk(KERN_INFO
-                                               "raid1:%s: read error corrected "
+                                               "md/raid1:%s: read error corrected "
                                                "(%d sectors at %llu on %s)\n",
                                                mdname(mddev), s,
                                                (unsigned long long)(sect +
@@ -1687,8 +1690,9 @@ static void raid1d(mddev_t *mddev)
 
                         bio = r1_bio->bios[r1_bio->read_disk];
                         if ((disk=read_balance(conf, r1_bio)) == -1) {
-                                printk(KERN_ALERT "raid1: %s: unrecoverable I/O"
+                                printk(KERN_ALERT "md/raid1:%s: %s: unrecoverable I/O"
                                        " read error for block %llu\n",
+                                       mdname(mddev),
                                        bdevname(bio->bi_bdev,b),
                                        (unsigned long long)r1_bio->sector);
                                 raid_end_bio_io(r1_bio);
@@ -1702,8 +1706,9 @@ static void raid1d(mddev_t *mddev)
                                 r1_bio->bios[r1_bio->read_disk] = bio;
                                 rdev = conf->mirrors[disk].rdev;
                                 if (printk_ratelimit())
-                                        printk(KERN_ERR "raid1: redirecting sector %llu to"
+                                        printk(KERN_ERR "md/raid1:%s: redirecting sector %llu to"
                                                " other mirror: %s\n",
+                                               mdname(mddev),
                                                (unsigned long long)r1_bio->sector,
                                                bdevname(rdev->bdev,b));
                                 bio->bi_sector = r1_bio->sector + rdev->data_offset;
@@ -1760,13 +1765,8 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
         int still_degraded = 0;
 
         if (!conf->r1buf_pool)
-        {
-/*
-                printk("sync start - bitmap %p\n", mddev->bitmap);
-*/
                 if (init_resync(conf))
                         return 0;
-        }
 
         max_sector = mddev->dev_sectors;
         if (sector_nr >= max_sector) {
@@ -2047,7 +2047,7 @@ static conf_t *setup_conf(mddev_t *mddev)
 
         err = -EIO;
         if (conf->last_used < 0) {
-                printk(KERN_ERR "raid1: no operational mirrors for %s\n",
+                printk(KERN_ERR "md/raid1:%s: no operational mirrors\n",
                        mdname(mddev));
                 goto abort;
         }
@@ -2055,7 +2055,7 @@ static conf_t *setup_conf(mddev_t *mddev)
         conf->thread = md_register_thread(raid1d, mddev, NULL);
         if (!conf->thread) {
                 printk(KERN_ERR
-                       "raid1: couldn't allocate thread for %s\n",
+                       "md/raid1:%s: couldn't allocate thread\n",
                        mdname(mddev));
                 goto abort;
         }
@@ -2081,12 +2081,12 @@ static int run(mddev_t *mddev)
         mdk_rdev_t *rdev;
 
         if (mddev->level != 1) {
-                printk("raid1: %s: raid level not set to mirroring (%d)\n",
+                printk(KERN_ERR "md/raid1:%s: raid level not set to mirroring (%d)\n",
                        mdname(mddev), mddev->level);
                 return -EIO;
         }
         if (mddev->reshape_position != MaxSector) {
-                printk("raid1: %s: reshape_position set but not supported\n",
+                printk(KERN_ERR "md/raid1:%s: reshape_position set but not supported\n",
                        mdname(mddev));
                 return -EIO;
         }
@@ -2129,11 +2129,11 @@ static int run(mddev_t *mddev)
                 mddev->recovery_cp = MaxSector;
 
         if (mddev->recovery_cp != MaxSector)
-                printk(KERN_NOTICE "raid1: %s is not clean"
+                printk(KERN_NOTICE "md/raid1:%s: not clean"
                        " -- starting background reconstruction\n",
                        mdname(mddev));
         printk(KERN_INFO 
-                "raid1: raid set %s active with %d out of %d mirrors\n",
+                "md/raid1:%s: active with %d out of %d mirrors\n",
                 mdname(mddev), mddev->raid_disks - mddev->degraded, 
                 mddev->raid_disks);
 
@@ -2160,7 +2160,8 @@ static int stop(mddev_t *mddev)
 
         /* wait for behind writes to complete */
         if (bitmap && atomic_read(&bitmap->behind_writes) > 0) {
-                printk(KERN_INFO "raid1: behind writes in progress on device %s, waiting to stop.\n", mdname(mddev));
+                printk(KERN_INFO "md/raid1:%s: behind writes in progress - waiting to stop.\n",
+                       mdname(mddev));
                 /* need to kick something here to make sure I/O goes? */
                 wait_event(bitmap->behind_wait,
                            atomic_read(&bitmap->behind_writes) == 0);
@@ -2288,9 +2289,9 @@ static int raid1_reshape(mddev_t *mddev)
                         if (sysfs_create_link(&mddev->kobj,
                                               &rdev->kobj, nm))
                                 printk(KERN_WARNING
-                                       "md/raid1: cannot register "
-                                       "%s for %s\n",
-                                       nm, mdname(mddev));
+                                       "md/raid1:%s: cannot register "
+                                       "%s\n",
+                                       mdname(mddev), nm);
                 }
                 if (rdev)
                         newmirrors[d2++].rdev = rdev;