Skip to content

Commit

Permalink
md: rename "mdk_personality" to "md_personality"
Browse files Browse the repository at this point in the history 
"mdk" doesn't mean anything any more.

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed Oct 11, 2011
1 parent 29d3247 commit 84fc4b5
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion drivers/md/faulty.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/linear.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions drivers/md/md.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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])
Expand All @@ -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;
Expand Down Expand Up @@ -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.. */
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions drivers/md/md.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/multipath.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion drivers/md/raid10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions drivers/md/raid5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit 84fc4b5

Please sign in to comment.