|
@@ -158,7 +158,8 @@ static linear_conf_t *linear_conf(mddev_t *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("linear: disk numbering problem. Aborting!\n");
|
|
|
|
|
|
+ printk(KERN_ERR "md/linear:%s: disk numbering problem. Aborting!\n",
|
|
|
|
+ mdname(mddev));
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -186,7 +187,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks)
|
|
|
|
|
|
}
|
|
}
|
|
if (cnt != raid_disks) {
|
|
if (cnt != raid_disks) {
|
|
- printk("linear: not enough drives present. Aborting!\n");
|
|
|
|
|
|
+ printk(KERN_ERR "md/linear:%s: not enough drives present. Aborting!\n",
|
|
|
|
+ mdname(mddev));
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -305,12 +307,14 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio)
|
|
|| (bio->bi_sector < start_sector))) {
|
|
|| (bio->bi_sector < start_sector))) {
|
|
char b[BDEVNAME_SIZE];
|
|
char b[BDEVNAME_SIZE];
|
|
|
|
|
|
- printk("linear_make_request: Sector %llu out of bounds on "
|
|
|
|
- "dev %s: %llu sectors, offset %llu\n",
|
|
|
|
- (unsigned long long)bio->bi_sector,
|
|
|
|
- bdevname(tmp_dev->rdev->bdev, b),
|
|
|
|
- (unsigned long long)tmp_dev->rdev->sectors,
|
|
|
|
- (unsigned long long)start_sector);
|
|
|
|
|
|
+ printk(KERN_ERR
|
|
|
|
+ "md/linear:%s: make_request: Sector %llu out of bounds on "
|
|
|
|
+ "dev %s: %llu sectors, offset %llu\n",
|
|
|
|
+ mdname(mddev),
|
|
|
|
+ (unsigned long long)bio->bi_sector,
|
|
|
|
+ bdevname(tmp_dev->rdev->bdev, b),
|
|
|
|
+ (unsigned long long)tmp_dev->rdev->sectors,
|
|
|
|
+ (unsigned long long)start_sector);
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|
|
bio_io_error(bio);
|
|
bio_io_error(bio);
|
|
return 0;
|
|
return 0;
|