md/linear: remove typedefs: dev_info_t -> struct dev_info
Signed-off-by: NeilBrown <neilb@suse.de>
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index 2e176e0..e9159ebc 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -26,7 +26,7 @@
/*
* find which device holds a particular offset
*/
-static inline dev_info_t *which_dev(struct mddev *mddev, sector_t sector)
+static inline struct dev_info *which_dev(struct mddev *mddev, sector_t sector)
{
int lo, mid, hi;
linear_conf_t *conf;
@@ -64,7 +64,7 @@
struct bio_vec *biovec)
{
struct mddev *mddev = q->queuedata;
- dev_info_t *dev0;
+ struct dev_info *dev0;
unsigned long maxsectors, bio_sectors = bvm->bi_size >> 9;
sector_t sector = bvm->bi_sector + get_start_sect(bvm->bi_bdev);
@@ -129,7 +129,7 @@
struct md_rdev *rdev;
int i, cnt;
- conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(dev_info_t),
+ conf = kzalloc (sizeof (*conf) + raid_disks*sizeof(struct dev_info),
GFP_KERNEL);
if (!conf)
return NULL;
@@ -139,7 +139,7 @@
list_for_each_entry(rdev, &mddev->disks, same_set) {
int j = rdev->raid_disk;
- dev_info_t *disk = conf->disks + j;
+ struct dev_info *disk = conf->disks + j;
sector_t sectors;
if (j < 0 || j >= raid_disks || disk->rdev) {
@@ -266,7 +266,7 @@
static int linear_make_request (struct mddev *mddev, struct bio *bio)
{
- dev_info_t *tmp_dev;
+ struct dev_info *tmp_dev;
sector_t start_sector;
if (unlikely(bio->bi_rw & REQ_FLUSH)) {
diff --git a/drivers/md/linear.h b/drivers/md/linear.h
index 367967a..4d0cf3c 100644
--- a/drivers/md/linear.h
+++ b/drivers/md/linear.h
@@ -6,13 +6,11 @@
sector_t end_sector;
};
-typedef struct dev_info dev_info_t;
-
struct linear_private_data
{
struct rcu_head rcu;
sector_t array_sectors;
- dev_info_t disks[0];
+ struct dev_info disks[0];
};