|
@@ -101,8 +101,8 @@ 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",
|
|
|
|
- mdname(mddev));
|
|
|
|
|
|
+ pr_warn("md/linear:%s: disk numbering problem. Aborting!\n",
|
|
|
|
+ mdname(mddev));
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -123,8 +123,8 @@ 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",
|
|
|
|
- mdname(mddev));
|
|
|
|
|
|
+ pr_warn("md/linear:%s: not enough drives present. Aborting!\n",
|
|
|
|
+ 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
|
|
|
|
- "md/linear:%s: make_request: Sector %llu out of bounds on "
|
|
|
|
- "dev %s: %llu sectors, offset %llu\n",
|
|
|
|
|
|
+ pr_err("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 @@ out_of_bounds:
|
|
|
|
|
|
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);
|
|
}
|
|
}
|
|
|
|
|