9 files changed, 22 insertions, 22 deletions

diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c
index 571445e52541..60816b132c2e 100644
--- a/drivers/md/faulty.c
+++ b/drivers/md/faulty.c
@@ -334,7 +334,7 @@ static int stop(struct mddev *mddev)
         return 0;
 }
 
-static struct mdk_personality faulty_personality =
+static struct md_personality faulty_personality =
 {
         .name           = "faulty",
         .level          = LEVEL_FAULTY,
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index cbac48cfe72b..10c5844460cb 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -330,7 +330,7 @@ static void linear_status (struct seq_file *seq, struct mddev *mddev)
 }
 
 
-static struct mdk_personality linear_personality =
+static struct md_personality linear_personality =
 {
         .name           = "linear",
         .level          = LEVEL_LINEAR,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1f661bbcaefe..7a491771ff4d 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -771,9 +771,9 @@ static struct md_rdev * find_rdev(struct mddev * mddev, dev_t dev)
         return NULL;
 }
 
-static struct mdk_personality *find_pers(int level, char *clevel)
+static struct md_personality *find_pers(int level, char *clevel)
 {
-        struct mdk_personality *pers;
+        struct md_personality *pers;
         list_for_each_entry(pers, &pers_list, list) {
                 if (level != LEVEL_NONE && pers->level == level)
                         return pers;
@@ -3272,7 +3272,7 @@ __ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store);
 static ssize_t
 level_show(struct mddev *mddev, char *page)
 {
-        struct mdk_personality *p = mddev->pers;
+        struct md_personality *p = mddev->pers;
         if (p)
                 return sprintf(page, "%s\n", p->name);
         else if (mddev->clevel[0])
@@ -3288,7 +3288,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
 {
         char clevel[16];
         ssize_t rv = len;
-        struct mdk_personality *pers;
+        struct md_personality *pers;
         long level;
         void *priv;
         struct md_rdev *rdev;
@@ -4700,7 +4700,7 @@ int md_run(struct mddev *mddev)
 {
         int err;
         struct md_rdev *rdev;
-        struct mdk_personality *pers;
+        struct md_personality *pers;
 
         if (list_empty(&mddev->disks))
                 /* cannot run an array with no devices.. */
@@ -6655,7 +6655,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
         struct bitmap *bitmap;
 
         if (v == (void*)1) {
-                struct mdk_personality *pers;
+                struct md_personality *pers;
                 seq_printf(seq, "Personalities : ");
                 spin_lock(&pers_lock);
                 list_for_each_entry(pers, &pers_list, list)
@@ -6811,7 +6811,7 @@ static const struct file_operations md_seq_fops = {
         .poll           = mdstat_poll,
 };
 
-int register_md_personality(struct mdk_personality *p)
+int register_md_personality(struct md_personality *p)
 {
         spin_lock(&pers_lock);
         list_add_tail(&p->list, &pers_list);
@@ -6820,7 +6820,7 @@ int register_md_personality(struct mdk_personality *p)
         return 0;
 }
 
-int unregister_md_personality(struct mdk_personality *p)
+int unregister_md_personality(struct md_personality *p)
 {
         printk(KERN_INFO "md: %s personality unregistered\n", p->name);
         spin_lock(&pers_lock);
diff --git a/drivers/md/md.h b/drivers/md/md.h
index b618da59ca1c..51c1d91557e0 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -184,7 +184,7 @@ extern void md_ack_all_badblocks(struct badblocks *bb);
 
 struct mddev {
         void                            *private;
-        struct mdk_personality          *pers;
+        struct md_personality           *pers;
         dev_t                           unit;
         int                             md_minor;
         struct list_head                disks;
@@ -413,7 +413,7 @@ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sect
         atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
 }
 
-struct mdk_personality
+struct md_personality
 {
         char *name;
         int level;
@@ -551,8 +551,8 @@ static inline void safe_put_page(struct page *p)
         if (p) put_page(p);
 }
 
-extern int register_md_personality(struct mdk_personality *p);
-extern int unregister_md_personality(struct mdk_personality *p);
+extern int register_md_personality(struct md_personality *p);
+extern int unregister_md_personality(struct md_personality *p);
 extern struct md_thread *md_register_thread(
         void (*run)(struct mddev *mddev),
         struct mddev *mddev,
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 96505930afcb..d32c785e17d4 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -523,7 +523,7 @@ static int multipath_stop (struct mddev *mddev)
         return 0;
 }
 
-static struct mdk_personality multipath_personality =
+static struct md_personality multipath_personality =
 {
         .name           = "multipath",
         .level          = LEVEL_MULTIPATH,
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 38a9012ff4fe..0eb08a4df759 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -670,7 +670,7 @@ static void raid0_quiesce(struct mddev *mddev, int state)
 {
 }
 
-static struct mdk_personality raid0_personality=
+static struct md_personality raid0_personality=
 {
         .name           = "raid0",
         .level          = 0,
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e09f59545e97..e023a25acf54 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2738,7 +2738,7 @@ static void *raid1_takeover(struct mddev *mddev)
         return ERR_PTR(-EINVAL);
 }
 
-static struct mdk_personality raid1_personality =
+static struct md_personality raid1_personality =
 {
         .name           = "raid1",
         .level          = 1,
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index f6a9b0c8f5fa..8427ff1c5af1 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3050,7 +3050,7 @@ static void *raid10_takeover(struct mddev *mddev)
         return ERR_PTR(-EINVAL);
 }
 
-static struct mdk_personality raid10_personality =
+static struct md_personality raid10_personality =
 {
         .name           = "raid10",
         .level          = 10,
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 921e96670ad4..eea9379f7fae 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5591,7 +5591,7 @@ static void *raid4_takeover(struct mddev *mddev)
         return ERR_PTR(-EINVAL);
 }
 
-static struct mdk_personality raid5_personality;
+static struct md_personality raid5_personality;
 
 static void *raid6_takeover(struct mddev *mddev)
 {
@@ -5640,7 +5640,7 @@ static void *raid6_takeover(struct mddev *mddev)
 }
 
 
-static struct mdk_personality raid6_personality =
+static struct md_personality raid6_personality =
 {
         .name           = "raid6",
         .level          = 6,
@@ -5662,7 +5662,7 @@ static struct mdk_personality raid6_personality =
         .quiesce        = raid5_quiesce,
         .takeover       = raid6_takeover,
 };
-static struct mdk_personality raid5_personality =
+static struct md_personality raid5_personality =
 {
         .name           = "raid5",
         .level          = 5,
@@ -5685,7 +5685,7 @@ static struct mdk_personality raid5_personality =
         .takeover       = raid5_takeover,
 };
 
-static struct mdk_personality raid4_personality =
+static struct md_personality raid4_personality =
 {
         .name           = "raid4",
         .level          = 4,