openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

md: rename "mdk_personality" to "md_personality" 

"mdk" doesn't mean anything any more.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2011-10-11 16:49:58 +11:00
parent 29d3247ea2
commit 84fc4b56db
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/md/faulty.c
View File

@ -334,7 +334,7 @@ static int stop(struct mddev *mddev)
return 0; return 0;
} }
static struct mdk_personality faulty_personality = static struct md_personality faulty_personality =
{ {
.name = "faulty", .name = "faulty",
.level = LEVEL_FAULTY, .level = LEVEL_FAULTY,

2
drivers/md/linear.c
View File

@ -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", .name = "linear",
.level = LEVEL_LINEAR, .level = LEVEL_LINEAR,

16
drivers/md/md.c
View File

@ -771,9 +771,9 @@ static struct md_rdev * find_rdev(struct mddev * mddev, dev_t dev)
return NULL; 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) { list_for_each_entry(pers, &pers_list, list) {
if (level != LEVEL_NONE && pers->level == level) if (level != LEVEL_NONE && pers->level == level)
return pers; return pers;
@ -3272,7 +3272,7 @@ __ATTR(safe_mode_delay, S_IRUGO|S_IWUSR,safe_delay_show, safe_delay_store);
static ssize_t static ssize_t
level_show(struct mddev *mddev, char *page) level_show(struct mddev *mddev, char *page)
{ {
struct mdk_personality *p = mddev->pers; struct md_personality *p = mddev->pers;
if (p) if (p)
return sprintf(page, "%s\n", p->name); return sprintf(page, "%s\n", p->name);
else if (mddev->clevel[0]) else if (mddev->clevel[0])
@ -3288,7 +3288,7 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
{ {
char clevel[16]; char clevel[16];
ssize_t rv = len; ssize_t rv = len;
struct mdk_personality *pers; struct md_personality *pers;
long level; long level;
void *priv; void *priv;
struct md_rdev *rdev; struct md_rdev *rdev;
@ -4700,7 +4700,7 @@ int md_run(struct mddev *mddev)
{ {
int err; int err;
struct md_rdev *rdev; struct md_rdev *rdev;
struct mdk_personality *pers; struct md_personality *pers;
if (list_empty(&mddev->disks)) if (list_empty(&mddev->disks))
/* cannot run an array with no devices.. */ /* 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; struct bitmap *bitmap;
if (v == (void*)1) { if (v == (void*)1) {
struct mdk_personality *pers; struct md_personality *pers;
seq_printf(seq, "Personalities : "); seq_printf(seq, "Personalities : ");
spin_lock(&pers_lock); spin_lock(&pers_lock);
list_for_each_entry(pers, &pers_list, list) list_for_each_entry(pers, &pers_list, list)
@ -6811,7 +6811,7 @@ static const struct file_operations md_seq_fops = {
.poll = mdstat_poll, .poll = mdstat_poll,
}; };
int register_md_personality(struct mdk_personality *p) int register_md_personality(struct md_personality *p)
{ {
spin_lock(&pers_lock); spin_lock(&pers_lock);
list_add_tail(&p->list, &pers_list); list_add_tail(&p->list, &pers_list);
@ -6820,7 +6820,7 @@ int register_md_personality(struct mdk_personality *p)
return 0; 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); printk(KERN_INFO "md: %s personality unregistered\n", p->name);
spin_lock(&pers_lock); spin_lock(&pers_lock);

8
drivers/md/md.h
View File

@ -184,7 +184,7 @@ extern void md_ack_all_badblocks(struct badblocks *bb);
struct mddev { struct mddev {
void *private; void *private;
struct mdk_personality *pers; struct md_personality *pers;
dev_t unit; dev_t unit;
int md_minor; int md_minor;
struct list_head disks; 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); atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
} }
struct mdk_personality struct md_personality
{ {
char *name; char *name;
int level; int level;
@ -551,8 +551,8 @@ static inline void safe_put_page(struct page *p)
if (p) put_page(p); if (p) put_page(p);
} }
extern int register_md_personality(struct mdk_personality *p); extern int register_md_personality(struct md_personality *p);
extern int unregister_md_personality(struct mdk_personality *p); extern int unregister_md_personality(struct md_personality *p);
extern struct md_thread *md_register_thread( extern struct md_thread *md_register_thread(
void (*run)(struct mddev *mddev), void (*run)(struct mddev *mddev),
struct mddev *mddev, struct mddev *mddev,

2
drivers/md/multipath.c
View File

@ -523,7 +523,7 @@ static int multipath_stop (struct mddev *mddev)
return 0; return 0;
} }
static struct mdk_personality multipath_personality = static struct md_personality multipath_personality =
{ {
.name = "multipath", .name = "multipath",
.level = LEVEL_MULTIPATH, .level = LEVEL_MULTIPATH,

2
drivers/md/raid0.c
View File

@ -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", .name = "raid0",
.level = 0, .level = 0,

2
drivers/md/raid1.c
View File

@ -2738,7 +2738,7 @@ static void *raid1_takeover(struct mddev *mddev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static struct mdk_personality raid1_personality = static struct md_personality raid1_personality =
{ {
.name = "raid1", .name = "raid1",
.level = 1, .level = 1,

2
drivers/md/raid10.c
View File

@ -3050,7 +3050,7 @@ static void *raid10_takeover(struct mddev *mddev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static struct mdk_personality raid10_personality = static struct md_personality raid10_personality =
{ {
.name = "raid10", .name = "raid10",
.level = 10, .level = 10,

8
drivers/md/raid5.c
View File

@ -5591,7 +5591,7 @@ static void *raid4_takeover(struct mddev *mddev)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
static struct mdk_personality raid5_personality; static struct md_personality raid5_personality;
static void *raid6_takeover(struct mddev *mddev) 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", .name = "raid6",
.level = 6, .level = 6,
@ -5662,7 +5662,7 @@ static struct mdk_personality raid6_personality =
.quiesce = raid5_quiesce, .quiesce = raid5_quiesce,
.takeover = raid6_takeover, .takeover = raid6_takeover,
}; };
static struct mdk_personality raid5_personality = static struct md_personality raid5_personality =
{ {
.name = "raid5", .name = "raid5",
.level = 5, .level = 5,
@ -5685,7 +5685,7 @@ static struct mdk_personality raid5_personality =
.takeover = raid5_takeover, .takeover = raid5_takeover,
}; };
static struct mdk_personality raid4_personality = static struct md_personality raid4_personality =
{ {
.name = "raid4", .name = "raid4",
.level = 4, .level = 4,