md: remove typedefs: mirror_info_t -> struct mirror_info

Signed-off-by: NeilBrown <neilb@suse.de>

4 files changed, 13 insertions, 17 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 6022111a4b28..f6eabeb21281 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -799,7 +799,7 @@ do_sync_io:
 static int make_request(struct mddev *mddev, struct bio * bio)
 {
         conf_t *conf = mddev->private;
-        mirror_info_t *mirror;
+        struct mirror_info *mirror;
         struct r1bio *r1_bio;
         struct bio *read_bio;
         int i, disks;
@@ -1268,7 +1268,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
         conf_t *conf = mddev->private;
         int err = -EEXIST;
         int mirror = 0;
-        mirror_info_t *p;
+        struct mirror_info *p;
         int first = 0;
         int last = mddev->raid_disks - 1;
 
@@ -1316,7 +1316,7 @@ static int raid1_remove_disk(struct mddev *mddev, int number)
         conf_t *conf = mddev->private;
         int err = 0;
         struct md_rdev *rdev;
-        mirror_info_t *p = conf->mirrors+ number;
+        struct mirror_info *p = conf->mirrors+ number;
 
         print_conf(conf);
         rdev = p->rdev;
@@ -2369,7 +2369,7 @@ static conf_t *setup_conf(struct mddev *mddev)
 {
         conf_t *conf;
         int i;
-        mirror_info_t *disk;
+        struct mirror_info *disk;
         struct md_rdev *rdev;
         int err = -ENOMEM;
 
@@ -2612,7 +2612,7 @@ static int raid1_reshape(struct mddev *mddev)
          */
         mempool_t *newpool, *oldpool;
         struct pool_info *newpoolinfo;
-        mirror_info_t *newmirrors;
+        struct mirror_info *newmirrors;
         conf_t *conf = mddev->private;
         int cnt, raid_disks;
         unsigned long flags;
diff --git a/drivers/md/raid1.h b/drivers/md/raid1.h
index d59e4676a1b0..dd5e66a4163f 100644
--- a/drivers/md/raid1.h
+++ b/drivers/md/raid1.h
@@ -1,8 +1,6 @@
 #ifndef _RAID1_H
 #define _RAID1_H
 
-typedef struct mirror_info mirror_info_t;
-
 struct mirror_info {
         struct md_rdev  *rdev;
         sector_t        head_position;
@@ -23,7 +21,7 @@ struct pool_info {
 
 struct r1_private_data_s {
         struct mddev            *mddev;
-        mirror_info_t           *mirrors;
+        struct mirror_info              *mirrors;
         int                     raid_disks;
 
         /* When choose the best device for a read (read_balance())
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index 6927998e253a..d5fb4c8da772 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -833,7 +833,7 @@ static void unfreeze_array(conf_t *conf)
 static int make_request(struct mddev *mddev, struct bio * bio)
 {
         conf_t *conf = mddev->private;
-        mirror_info_t *mirror;
+        struct mirror_info *mirror;
         struct r10bio *r10_bio;
         struct bio *read_bio;
         int i;
@@ -1249,7 +1249,7 @@ static void error(struct mddev *mddev, struct md_rdev *rdev)
 static void print_conf(conf_t *conf)
 {
         int i;
-        mirror_info_t *tmp;
+        struct mirror_info *tmp;
 
         printk(KERN_DEBUG "RAID10 conf printout:\n");
         if (!conf) {
@@ -1283,7 +1283,7 @@ static int raid10_spare_active(struct mddev *mddev)
 {
         int i;
         conf_t *conf = mddev->private;
-        mirror_info_t *tmp;
+        struct mirror_info *tmp;
         int count = 0;
         unsigned long flags;
 
@@ -1334,7 +1334,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
         else
                 mirror = first;
         for ( ; mirror <= last ; mirror++) {
-                mirror_info_t *p = &conf->mirrors[mirror];
+                struct mirror_info *p = &conf->mirrors[mirror];
                 if (p->recovery_disabled == mddev->recovery_disabled)
                         continue;
                 if (!p->rdev)
@@ -1373,7 +1373,7 @@ static int raid10_remove_disk(struct mddev *mddev, int number)
         conf_t *conf = mddev->private;
         int err = 0;
         struct md_rdev *rdev;
-        mirror_info_t *p = conf->mirrors+ number;
+        struct mirror_info *p = conf->mirrors+ number;
 
         print_conf(conf);
         rdev = p->rdev;
@@ -2840,7 +2840,7 @@ static int run(struct mddev *mddev)
 {
         conf_t *conf;
         int i, disk_idx, chunk_size;
-        mirror_info_t *disk;
+        struct mirror_info *disk;
         struct md_rdev *rdev;
         sector_t size;
 
diff --git a/drivers/md/raid10.h b/drivers/md/raid10.h
index be7f8d9cfc63..94f898a11be4 100644
--- a/drivers/md/raid10.h
+++ b/drivers/md/raid10.h
@@ -1,8 +1,6 @@
 #ifndef _RAID10_H
 #define _RAID10_H
 
-typedef struct mirror_info mirror_info_t;
-
 struct mirror_info {
         struct md_rdev  *rdev;
         sector_t        head_position;
@@ -15,7 +13,7 @@ struct mirror_info {
 
 struct r10_private_data_s {
         struct mddev            *mddev;
-        mirror_info_t           *mirrors;
+        struct mirror_info      *mirrors;
         int                     raid_disks;
         spinlock_t              device_lock;