md/raid1: change printk() to pr_*() (1d41c216) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/md/raid1.c

+41 −58

Original line number	Diff line number	Diff line
		@@ -347,12 +347,9 @@ static void raid1_end_read_request(struct bio *bio)
		* oops, read error:
		*/
		char b[BDEVNAME_SIZE];
		printk_ratelimited(
		KERN_ERR "md/raid1:%s: %s: "
		"rescheduling sector %llu\n",
		pr_err_ratelimited("md/raid1:%s: %s: rescheduling sector %llu\n",
		mdname(conf->mddev),
		bdevname(rdev->bdev,
		b),
		bdevname(rdev->bdev, b),
		(unsigned long long)r1_bio->sector);
		set_bit(R1BIO_ReadError, &r1_bio->state);
		reschedule_retry(r1_bio);
		@@ -1461,8 +1458,7 @@ static void raid1_error(struct mddev mddev, struct md_rdev rdev)
		set_bit(MD_RECOVERY_INTR, &mddev->recovery);
		set_mask_bits(&mddev->flags, 0,
		BIT(MD_CHANGE_DEVS) \| BIT(MD_CHANGE_PENDING));
		printk(KERN_ALERT
		"md/raid1:%s: Disk failure on %s, disabling device.\n"
		pr_crit("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);
		@@ -1472,12 +1468,12 @@ static void print_conf(struct r1conf *conf)
		{
		int i;

		printk(KERN_DEBUG "RAID1 conf printout:\n");
		pr_debug("RAID1 conf printout:\n");
		if (!conf) {
		printk(KERN_DEBUG "(!conf)\n");
		pr_debug("(!conf)\n");
		return;
		}
		printk(KERN_DEBUG " --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
		pr_debug(" --- wd:%d rd:%d\n", conf->raid_disks - conf->mddev->degraded,
		conf->raid_disks);

		rcu_read_lock();
		@@ -1485,7 +1481,7 @@ static void print_conf(struct r1conf *conf)
		char b[BDEVNAME_SIZE];
		struct md_rdev *rdev = rcu_dereference(conf->mirrors[i].rdev);
		if (rdev)
		printk(KERN_DEBUG " disk %d, wo:%d, o:%d, dev:%s\n",
		pr_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));
		@@ -1825,8 +1821,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
		* work just disable and interrupt the recovery.
		* Don't fail devices as that won't really help.
		*/
		printk(KERN_ALERT "md/raid1:%s: %s: unrecoverable I/O read error"
		" for block %llu\n",
		pr_crit_ratelimited("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);
		@@ -2122,9 +2117,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
		if (r1_sync_page_io(rdev, sect, s,
		conf->tmppage, READ)) {
		atomic_add(s, &rdev->corrected_errors);
		printk(KERN_INFO
		"md/raid1:%s: read error corrected "
		"(%d sectors at %llu on %s)\n",
		pr_info("md/raid1:%s: read error corrected (%d sectors at %llu on %s)\n",
		mdname(mddev), s,
		(unsigned long long)(sect +
		rdev->data_offset),
		@@ -2317,8 +2310,7 @@ static void handle_read_error(struct r1conf conf, struct r1bio r1_bio)
		read_more:
		disk = read_balance(conf, r1_bio, &max_sectors);
		if (disk == -1) {
		printk(KERN_ALERT "md/raid1:%s: %s: unrecoverable I/O"
		" read error for block %llu\n",
		pr_crit_ratelimited("md/raid1:%s: %s: unrecoverable I/O read error for block %llu\n",
		mdname(mddev), b, (unsigned long long)r1_bio->sector);
		raid_end_bio_io(r1_bio);
		} else {
		@@ -2330,9 +2322,7 @@ static void handle_read_error(struct r1conf conf, struct r1bio r1_bio)
		max_sectors);
		r1_bio->bios[r1_bio->read_disk] = bio;
		rdev = conf->mirrors[disk].rdev;
		printk_ratelimited(KERN_ERR
		"md/raid1:%s: redirecting sector %llu"
		" to other mirror: %s\n",
		pr_info_ratelimited("md/raid1:%s: redirecting sector %llu to other mirror: %s\n",
		mdname(mddev),
		(unsigned long long)r1_bio->sector,
		bdevname(rdev->bdev, b));
		@@ -2875,12 +2865,8 @@ static struct r1conf setup_conf(struct mddev mddev)

		err = -ENOMEM;
		conf->thread = md_register_thread(raid1d, mddev, "raid1");
		if (!conf->thread) {
		printk(KERN_ERR
		"md/raid1:%s: couldn't allocate thread\n",
		mdname(mddev));
		if (!conf->thread)
		goto abort;
		}

		return conf;

		@@ -2905,12 +2891,12 @@ static int raid1_run(struct mddev *mddev)
		bool discard_supported = false;

		if (mddev->level != 1) {
		printk(KERN_ERR "md/raid1:%s: raid level not set to mirroring (%d)\n",
		pr_warn("md/raid1:%s: raid level not set to mirroring (%d)\n",
		mdname(mddev), mddev->level);
		return -EIO;
		}
		if (mddev->reshape_position != MaxSector) {
		printk(KERN_ERR "md/raid1:%s: reshape_position set but not supported\n",
		pr_warn("md/raid1:%s: reshape_position set but not supported\n",
		mdname(mddev));
		return -EIO;
		}
		@@ -2950,11 +2936,9 @@ static int raid1_run(struct mddev *mddev)
		mddev->recovery_cp = MaxSector;

		if (mddev->recovery_cp != MaxSector)
		printk(KERN_NOTICE "md/raid1:%s: not clean"
		" -- starting background reconstruction\n",
		pr_info("md/raid1:%s: not clean -- starting background reconstruction\n",
		mdname(mddev));
		printk(KERN_INFO
		"md/raid1:%s: active with %d out of %d mirrors\n",
		pr_info("md/raid1:%s: active with %d out of %d mirrors\n",
		mdname(mddev), mddev->raid_disks - mddev->degraded,
		mddev->raid_disks);

		@@ -3107,8 +3091,7 @@ static int raid1_reshape(struct mddev *mddev)
		rdev->raid_disk = d2;
		sysfs_unlink_rdev(mddev, rdev);
		if (sysfs_link_rdev(mddev, rdev))
		printk(KERN_WARNING
		"md/raid1:%s: cannot register rd%d\n",
		pr_warn("md/raid1:%s: cannot register rd%d\n",
		mdname(mddev), rdev->raid_disk);
		}
		if (rdev)