Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84fc4b56 authored by NeilBrown's avatar NeilBrown
Browse files

md: rename "mdk_personality" to "md_personality" 



"mdk" doesn't mean anything any more.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent 29d3247e

drivers/md/faulty.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/md/linear.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/md/md.c

+8 −8
Original line number Diff line number Diff line
@@ -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);

drivers/md/md.h

+4 −4
Original line number Diff line number Diff line
@@ -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,

drivers/md/multipath.c

+1 −1
Original line number Diff line number Diff line
@@ -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,