Commit a2e202af authored by NeilBrown's avatar NeilBrown Committed by Shaohua Li
Browse files

md/linear: replace printk() with pr_*() 



Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent ec0cc226

drivers/md/linear.c

+5 −8
Original line number Original line Diff line number Diff line
@@ -101,7 +101,7 @@ static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks) 
		sector_t sectors;

		sector_t sectors;





		if (j < 0 || j >= raid_disks || disk->rdev) {

		if (j < 0 || j >= raid_disks || disk->rdev) {

			printk(KERN_ERR "md/linear:%s: disk numbering problem. Aborting!\n",

			pr_warn("md/linear:%s: disk numbering problem. Aborting!\n",

				mdname(mddev));

				mdname(mddev));

			goto out;

			goto out;

		}

		}
@@ -123,7 +123,7 @@ static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks) 
			discard_supported = true;

			discard_supported = true;

	}

	}

	if (cnt != raid_disks) {

	if (cnt != raid_disks) {

		printk(KERN_ERR "md/linear:%s: not enough drives present. Aborting!\n",

		pr_warn("md/linear:%s: not enough drives present. Aborting!\n",

			mdname(mddev));

			mdname(mddev));

		goto out;

		goto out;

	}

	}
@@ -262,9 +262,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) 
	return;

	return;





out_of_bounds:

out_of_bounds:

	printk(KERN_ERR

	pr_err("md/linear:%s: make_request: Sector %llu out of bounds on dev %s: %llu sectors, offset %llu\n",

	       "md/linear:%s: make_request: Sector %llu out of bounds on "

	       "dev %s: %llu sectors, offset %llu\n",

	       mdname(mddev),

	       mdname(mddev),

	       (unsigned long long)bio->bi_iter.bi_sector,

	       (unsigned long long)bio->bi_iter.bi_sector,

	       bdevname(tmp_dev->rdev->bdev, b),

	       bdevname(tmp_dev->rdev->bdev, b),
@@ -275,7 +273,6 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio) 




static void linear_status (struct seq_file *seq, struct mddev *mddev)

static void linear_status (struct seq_file *seq, struct mddev *mddev)

{

{



	seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2);

	seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2);

}

}