aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-10-11 01:49:58 -0400
committerNeilBrown <neilb@suse.de>2011-10-11 01:49:58 -0400
commit84fc4b56db85cb9e05326424049973a2036c9940 (patch)
treeb8f942766ad620d63da92c24df56032168879253 /drivers/md
parent29d3247ea2274bca0d0b7f41fcf3b82e0a8bc44c (diff)
md: rename "mdk_personality" to "md_personality"
"mdk" doesn't mean anything any more. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/faulty.c2
-rw-r--r--drivers/md/linear.c2
-rw-r--r--drivers/md/md.c16
-rw-r--r--drivers/md/md.h8
-rw-r--r--drivers/md/multipath.c2
-rw-r--r--drivers/md/raid0.c2
-rw-r--r--drivers/md/raid1.c2
-rw-r--r--drivers/md/raid10.c2
-rw-r--r--drivers/md/raid5.c8
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)
334 return 0; 334 return 0;
335} 335}
336 336
337static struct mdk_personality faulty_personality = 337static struct md_personality faulty_personality =
338{ 338{
339 .name = "faulty", 339 .name = "faulty",
340 .level = LEVEL_FAULTY, 340 .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)
330} 330}
331 331
332 332
333static struct mdk_personality linear_personality = 333static struct md_personality linear_personality =
334{ 334{
335 .name = "linear", 335 .name = "linear",
336 .level = LEVEL_LINEAR, 336 .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)
771 return NULL; 771 return NULL;
772} 772}
773 773
774static struct mdk_personality *find_pers(int level, char *clevel) 774static struct md_personality *find_pers(int level, char *clevel)
775{ 775{
776 struct mdk_personality *pers; 776 struct md_personality *pers;
777 list_for_each_entry(pers, &pers_list, list) { 777 list_for_each_entry(pers, &pers_list, list) {
778 if (level != LEVEL_NONE && pers->level == level) 778 if (level != LEVEL_NONE && pers->level == level)
779 return pers; 779 return pers;
@@ -3272,7 +3272,7 @@ __ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store);
3272static ssize_t 3272static ssize_t
3273level_show(struct mddev *mddev, char *page) 3273level_show(struct mddev *mddev, char *page)
3274{ 3274{
3275 struct mdk_personality *p = mddev->pers; 3275 struct md_personality *p = mddev->pers;
3276 if (p) 3276 if (p)
3277 return sprintf(page, "%s\n", p->name); 3277 return sprintf(page, "%s\n", p->name);
3278 else if (mddev->clevel[0]) 3278 else if (mddev->clevel[0])
@@ -3288,7 +3288,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
3288{ 3288{
3289 char clevel[16]; 3289 char clevel[16];
3290 ssize_t rv = len; 3290 ssize_t rv = len;
3291 struct mdk_personality *pers; 3291 struct md_personality *pers;
3292 long level; 3292 long level;
3293 void *priv; 3293 void *priv;
3294 struct md_rdev *rdev; 3294 struct md_rdev *rdev;
@@ -4700,7 +4700,7 @@ int md_run(struct mddev *mddev)
4700{ 4700{
4701 int err; 4701 int err;
4702 struct md_rdev *rdev; 4702 struct md_rdev *rdev;
4703 struct mdk_personality *pers; 4703 struct md_personality *pers;
4704 4704
4705 if (list_empty(&mddev->disks)) 4705 if (list_empty(&mddev->disks))
4706 /* cannot run an array with no devices.. */ 4706 /* cannot run an array with no devices.. */
@@ -6655,7 +6655,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
6655 struct bitmap *bitmap; 6655 struct bitmap *bitmap;
6656 6656
6657 if (v == (void*)1) { 6657 if (v == (void*)1) {
6658 struct mdk_personality *pers; 6658 struct md_personality *pers;
6659 seq_printf(seq, "Personalities : "); 6659 seq_printf(seq, "Personalities : ");
6660 spin_lock(&pers_lock); 6660 spin_lock(&pers_lock);
6661 list_for_each_entry(pers, &pers_list, list) 6661 list_for_each_entry(pers, &pers_list, list)
@@ -6811,7 +6811,7 @@ static const struct file_operations md_seq_fops = {
6811 .poll = mdstat_poll, 6811 .poll = mdstat_poll,
6812}; 6812};
6813 6813
6814int register_md_personality(struct mdk_personality *p) 6814int register_md_personality(struct md_personality *p)
6815{ 6815{
6816 spin_lock(&pers_lock); 6816 spin_lock(&pers_lock);
6817 list_add_tail(&p->list, &pers_list); 6817 list_add_tail(&p->list, &pers_list);
@@ -6820,7 +6820,7 @@ int register_md_personality(struct mdk_personality *p)
6820 return 0; 6820 return 0;
6821} 6821}
6822 6822
6823int unregister_md_personality(struct mdk_personality *p) 6823int unregister_md_personality(struct md_personality *p)
6824{ 6824{
6825 printk(KERN_INFO "md: %s personality unregistered\n", p->name); 6825 printk(KERN_INFO "md: %s personality unregistered\n", p->name);
6826 spin_lock(&pers_lock); 6826 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);
184 184
185struct mddev { 185struct mddev {
186 void *private; 186 void *private;
187 struct mdk_personality *pers; 187 struct md_personality *pers;
188 dev_t unit; 188 dev_t unit;
189 int md_minor; 189 int md_minor;
190 struct list_head disks; 190 struct list_head disks;
@@ -413,7 +413,7 @@ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sect
413 atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); 413 atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
414} 414}
415 415
416struct mdk_personality 416struct md_personality
417{ 417{
418 char *name; 418 char *name;
419 int level; 419 int level;
@@ -551,8 +551,8 @@ static inline void safe_put_page(struct page *p)
551 if (p) put_page(p); 551 if (p) put_page(p);
552} 552}
553 553
554extern int register_md_personality(struct mdk_personality *p); 554extern int register_md_personality(struct md_personality *p);
555extern int unregister_md_personality(struct mdk_personality *p); 555extern int unregister_md_personality(struct md_personality *p);
556extern struct md_thread *md_register_thread( 556extern struct md_thread *md_register_thread(
557 void (*run)(struct mddev *mddev), 557 void (*run)(struct mddev *mddev),
558 struct mddev *mddev, 558 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)
523 return 0; 523 return 0;
524} 524}
525 525
526static struct mdk_personality multipath_personality = 526static struct md_personality multipath_personality =
527{ 527{
528 .name = "multipath", 528 .name = "multipath",
529 .level = LEVEL_MULTIPATH, 529 .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)
670{ 670{
671} 671}
672 672
673static struct mdk_personality raid0_personality= 673static struct md_personality raid0_personality=
674{ 674{
675 .name = "raid0", 675 .name = "raid0",
676 .level = 0, 676 .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)
2738 return ERR_PTR(-EINVAL); 2738 return ERR_PTR(-EINVAL);
2739} 2739}
2740 2740
2741static struct mdk_personality raid1_personality = 2741static struct md_personality raid1_personality =
2742{ 2742{
2743 .name = "raid1", 2743 .name = "raid1",
2744 .level = 1, 2744 .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)
3050 return ERR_PTR(-EINVAL); 3050 return ERR_PTR(-EINVAL);
3051} 3051}
3052 3052
3053static struct mdk_personality raid10_personality = 3053static struct md_personality raid10_personality =
3054{ 3054{
3055 .name = "raid10", 3055 .name = "raid10",
3056 .level = 10, 3056 .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)
5591 return ERR_PTR(-EINVAL); 5591 return ERR_PTR(-EINVAL);
5592} 5592}
5593 5593
5594static struct mdk_personality raid5_personality; 5594static struct md_personality raid5_personality;
5595 5595
5596static void *raid6_takeover(struct mddev *mddev) 5596static void *raid6_takeover(struct mddev *mddev)
5597{ 5597{
@@ -5640,7 +5640,7 @@ static void *raid6_takeover(struct mddev *mddev)
5640} 5640}
5641 5641
5642 5642
5643static struct mdk_personality raid6_personality = 5643static struct md_personality raid6_personality =
5644{ 5644{
5645 .name = "raid6", 5645 .name = "raid6",
5646 .level = 6, 5646 .level = 6,
@@ -5662,7 +5662,7 @@ static struct mdk_personality raid6_personality =
5662 .quiesce = raid5_quiesce, 5662 .quiesce = raid5_quiesce,
5663 .takeover = raid6_takeover, 5663 .takeover = raid6_takeover,
5664}; 5664};
5665static struct mdk_personality raid5_personality = 5665static struct md_personality raid5_personality =
5666{ 5666{
5667 .name = "raid5", 5667 .name = "raid5",
5668 .level = 5, 5668 .level = 5,
@@ -5685,7 +5685,7 @@ static struct mdk_personality raid5_personality =
5685 .takeover = raid5_takeover, 5685 .takeover = raid5_takeover,
5686}; 5686};
5687 5687
5688static struct mdk_personality raid4_personality = 5688static struct md_personality raid4_personality =
5689{ 5689{
5690 .name = "raid4", 5690 .name = "raid4",
5691 .level = 4, 5691 .level = 4,