* ->dev killed for md/linear.c (same as previous parts)
diff -urN C24-0/drivers/md/linear.c C24-current/drivers/md/linear.c
--- C24-0/drivers/md/linear.c Thu Jun 20 13:37:24 2002
+++ C24-current/drivers/md/linear.c Sat Jun 29 17:05:33 2002
@@ -60,7 +60,6 @@
goto out;
}
- disk->dev = rdev->dev;
disk->bdev = rdev->bdev;
atomic_inc(&rdev->bdev->bd_count);
disk->size = rdev->size;
@@ -163,7 +162,7 @@
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 @@
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 -urN C24-0/include/linux/raid/linear.h C24-current/include/linux/raid/linear.h
--- C24-0/include/linux/raid/linear.h Mon Apr 29 08:06:41 2002
+++ C24-current/include/linux/raid/linear.h Sat Jun 29 17:05:39 2002
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Jul 07 2002 - 22:00:14 EST