diff options
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r-- | drivers/md/md.c | 16 |
1 files changed, 8 insertions, 8 deletions
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 | ||
774 | static struct mdk_personality *find_pers(int level, char *clevel) | 774 | static 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); | |||
3272 | static ssize_t | 3272 | static ssize_t |
3273 | level_show(struct mddev *mddev, char *page) | 3273 | level_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 | ||
6814 | int register_md_personality(struct mdk_personality *p) | 6814 | int 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 | ||
6823 | int unregister_md_personality(struct mdk_personality *p) | 6823 | int 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); |