Commit dc5d0e46 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] raid kdev_t cleanups - part 3

	* ->dev killed for md/linear.c (same as previous parts)
parent b60f0c2b
...@@ -60,7 +60,6 @@ static int linear_run (mddev_t *mddev) ...@@ -60,7 +60,6 @@ static int linear_run (mddev_t *mddev)
goto out; goto out;
} }
disk->dev = rdev->dev;
disk->bdev = rdev->bdev; disk->bdev = rdev->bdev;
atomic_inc(&rdev->bdev->bd_count); atomic_inc(&rdev->bdev->bd_count);
disk->size = rdev->size; disk->size = rdev->size;
...@@ -163,7 +162,7 @@ static int linear_make_request (request_queue_t *q, struct bio *bio) ...@@ -163,7 +162,7 @@ static int linear_make_request (request_queue_t *q, struct bio *bio)
if (block >= (tmp_dev->size + tmp_dev->offset) if (block >= (tmp_dev->size + tmp_dev->offset)
|| block < 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); bio_io_error(bio);
return 0; return 0;
} }
...@@ -186,11 +185,11 @@ static int linear_status (char *page, mddev_t *mddev) ...@@ -186,11 +185,11 @@ static int linear_status (char *page, mddev_t *mddev)
for (j = 0; j < conf->nr_zones; j++) for (j = 0; j < conf->nr_zones; j++)
{ {
sz += sprintf(page+sz, "[%s", 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) if (conf->hash_table[j].dev1)
sz += sprintf(page+sz, "/%s] ", sz += sprintf(page+sz, "/%s] ",
partition_name(conf->hash_table[j].dev1->dev)); bdev_partition_name(conf->hash_table[j].dev1->bdev));
else else
sz += sprintf(page+sz, "] "); sz += sprintf(page+sz, "] ");
} }
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/raid/md.h> #include <linux/raid/md.h>
struct dev_info { struct dev_info {
kdev_t dev;
struct block_device *bdev; struct block_device *bdev;
unsigned long size; unsigned long size;
unsigned long offset; unsigned long offset;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment