diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-04 08:54:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-07-04 08:54:40 -0700 |
| commit | 75eead62e1de867de280c4edfc24e86cc50577cb (patch) | |
| tree | 59990c678e78f2928badd292062a1632851a4f4d /drivers/md/linear.c | |
| parent | 78f1f626d9412e572e9e18a06c9989deaede8a9a (diff) | |
| parent | 88cc0d3e8fc80880372e6900712a6f3f8172286a (diff) | |
Merge home.transmeta.com:/home/torvalds/v2.5/viro
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'drivers/md/linear.c')
| -rw-r--r-- | drivers/md/linear.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index d8f29104dacf..daeeb075182c 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c @@ -60,7 +60,6 @@ static int linear_run (mddev_t *mddev) goto out; } - disk->dev = rdev->dev; disk->bdev = rdev->bdev; atomic_inc(&rdev->bdev->bd_count); disk->size = rdev->size; @@ -163,7 +162,7 @@ static int linear_make_request (request_queue_t *q, struct bio *bio) if (block >= (tmp_dev->size + tmp_dev->offset) || block < tmp_dev->offset) { - printk ("linear_make_request: Block %ld out of bounds on dev %s size %ld offset %ld\n", block, kdevname(tmp_dev->dev), tmp_dev->size, tmp_dev->offset); + printk ("linear_make_request: Block %ld out of bounds on dev %s size %ld offset %ld\n", block, bdevname(tmp_dev->bdev), tmp_dev->size, tmp_dev->offset); bio_io_error(bio); return 0; } @@ -186,11 +185,11 @@ static int linear_status (char *page, mddev_t *mddev) for (j = 0; j < conf->nr_zones; j++) { sz += sprintf(page+sz, "[%s", - partition_name(conf->hash_table[j].dev0->dev)); + bdev_partition_name(conf->hash_table[j].dev0->bdev)); if (conf->hash_table[j].dev1) sz += sprintf(page+sz, "/%s] ", - partition_name(conf->hash_table[j].dev1->dev)); + bdev_partition_name(conf->hash_table[j].dev1->bdev)); else sz += sprintf(page+sz, "] "); } |