[PATCH] raid kdev_t cleanups - part 3

	* ->dev killed for md/linear.c (same as previous parts)

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index d8f29104dacf9b8c57a68123aa05894273e0f7eb..daeeb075182c32af9aba7073f98acda058ab14ee 100644 (file)
--- 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, "] ");
        }

diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 56e7c06e108651a279e16204eaf02163f63b9580..dfb588a60ea6fc9ea300be9f25ceb83b6b2c396e 100644 (file)
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -4,7 +4,6 @@
 #include <linux/raid/md.h>
 
 struct dev_info {
-       kdev_t          dev;
        struct block_device *bdev;
        unsigned long   size;
        unsigned long   offset;