diff options
author | NeilBrown <neilb@suse.de> | 2010-05-03 01:12:04 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2010-05-18 01:27:59 -0400 |
commit | 2dc40f80945ac3e5ec05c3a6c75baf09b13cee51 (patch) | |
tree | b1f171090517f548e7c17302cef12a77aa9563b9 /drivers/md | |
parent | b5a20961f3479dda48bdc340354ee5469997839d (diff) |
md/linear: standardise all printk messages
md/linear:mdname:
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/linear.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index 3204a2263f21..d5d5064c4a66 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
@@ -158,7 +158,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) | |||
158 | sector_t sectors; | 158 | sector_t sectors; |
159 | 159 | ||
160 | if (j < 0 || j >= raid_disks || disk->rdev) { | 160 | if (j < 0 || j >= raid_disks || disk->rdev) { |
161 | printk("linear: disk numbering problem. Aborting!\n"); | 161 | printk(KERN_ERR "md/linear:%s: disk numbering problem. Aborting!\n", |
162 | mdname(mddev)); | ||
162 | goto out; | 163 | goto out; |
163 | } | 164 | } |
164 | 165 | ||
@@ -186,7 +187,8 @@ static linear_conf_t *linear_conf(mddev_t *mddev, int raid_disks) | |||
186 | 187 | ||
187 | } | 188 | } |
188 | if (cnt != raid_disks) { | 189 | if (cnt != raid_disks) { |
189 | printk("linear: not enough drives present. Aborting!\n"); | 190 | printk(KERN_ERR "md/linear:%s: not enough drives present. Aborting!\n", |
191 | mdname(mddev)); | ||
190 | goto out; | 192 | goto out; |
191 | } | 193 | } |
192 | 194 | ||
@@ -305,12 +307,14 @@ static int linear_make_request (mddev_t *mddev, struct bio *bio) | |||
305 | || (bio->bi_sector < start_sector))) { | 307 | || (bio->bi_sector < start_sector))) { |
306 | char b[BDEVNAME_SIZE]; | 308 | char b[BDEVNAME_SIZE]; |
307 | 309 | ||
308 | printk("linear_make_request: Sector %llu out of bounds on " | 310 | printk(KERN_ERR |
309 | "dev %s: %llu sectors, offset %llu\n", | 311 | "md/linear:%s: make_request: Sector %llu out of bounds on " |
310 | (unsigned long long)bio->bi_sector, | 312 | "dev %s: %llu sectors, offset %llu\n", |
311 | bdevname(tmp_dev->rdev->bdev, b), | 313 | mdname(mddev), |
312 | (unsigned long long)tmp_dev->rdev->sectors, | 314 | (unsigned long long)bio->bi_sector, |
313 | (unsigned long long)start_sector); | 315 | bdevname(tmp_dev->rdev->bdev, b), |
316 | (unsigned long long)tmp_dev->rdev->sectors, | ||
317 | (unsigned long long)start_sector); | ||
314 | rcu_read_unlock(); | 318 | rcu_read_unlock(); |
315 | bio_io_error(bio); | 319 | bio_io_error(bio); |
316 | return 0; | 320 | return 0; |