From e52ab209cd09f5df8e786474f506fe874dee956c Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 3 Jul 2012 15:56:52 +1000
Subject: [PATCH] --- yaml --- r: 311559 b: refs/heads/master c:
 0232605d987d8230b254aa139805bbb56a7ca30c h: refs/heads/master i:   311557:
 d71363bd874475740c8fdfe80eb9fbd875391fb5   311555:
 b297775d243a5b6e45ae6774f92d8384df0f788f   311551:
 606cd78d0af42df0c3e8c08c4ad766e5b34ba698 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/md/md.c        | 2 +-
 trunk/drivers/md/multipath.c | 3 ++-
 trunk/drivers/md/raid1.c     | 2 +-
 trunk/drivers/md/raid10.c    | 2 +-
 trunk/drivers/md/raid5.c     | 4 +++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 83b318be54e6..91f092f0e72e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 055d3747dbf00ce85c6872ecca4d466638e80c22
+refs/heads/master: 0232605d987d8230b254aa139805bbb56a7ca30c
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 973aa8459e98..c601c4be77c7 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -6751,7 +6751,7 @@ struct md_thread *md_register_thread(void (*run) (struct mddev *), struct mddev
 	thread->tsk = kthread_run(md_thread, thread,
 				  "%s_%s",
 				  mdname(thread->mddev),
-				  name ?: mddev->pers->name);
+				  name);
 	if (IS_ERR(thread->tsk)) {
 		kfree(thread);
 		return NULL;
diff --git a/trunk/drivers/md/multipath.c b/trunk/drivers/md/multipath.c
index 9339e67fcc79..61a1833ebaf3 100644
--- a/trunk/drivers/md/multipath.c
+++ b/trunk/drivers/md/multipath.c
@@ -474,7 +474,8 @@ static int multipath_run (struct mddev *mddev)
 	}
 
 	{
-		mddev->thread = md_register_thread(multipathd, mddev, NULL);
+		mddev->thread = md_register_thread(multipathd, mddev,
+						   "multipath");
 		if (!mddev->thread) {
 			printk(KERN_ERR "multipath: couldn't allocate thread"
 				" for %s\n", mdname(mddev));
diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c
index a9c7981ddd24..39b2a8aa3b23 100644
--- a/trunk/drivers/md/raid1.c
+++ b/trunk/drivers/md/raid1.c
@@ -2621,7 +2621,7 @@ static struct r1conf *setup_conf(struct mddev *mddev)
 		goto abort;
 	}
 	err = -ENOMEM;
-	conf->thread = md_register_thread(raid1d, mddev, NULL);
+	conf->thread = md_register_thread(raid1d, mddev, "raid1");
 	if (!conf->thread) {
 		printk(KERN_ERR
 		       "md/raid1:%s: couldn't allocate thread\n",
diff --git a/trunk/drivers/md/raid10.c b/trunk/drivers/md/raid10.c
index ae73e29298b2..edc1088a1320 100644
--- a/trunk/drivers/md/raid10.c
+++ b/trunk/drivers/md/raid10.c
@@ -3427,7 +3427,7 @@ static struct r10conf *setup_conf(struct mddev *mddev)
 	spin_lock_init(&conf->resync_lock);
 	init_waitqueue_head(&conf->wait_barrier);
 
-	conf->thread = md_register_thread(raid10d, mddev, NULL);
+	conf->thread = md_register_thread(raid10d, mddev, "raid10");
 	if (!conf->thread)
 		goto out;
 
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
index 62b6b3a83abf..a5135e595866 100644
--- a/trunk/drivers/md/raid5.c
+++ b/trunk/drivers/md/raid5.c
@@ -4840,6 +4840,7 @@ static struct r5conf *setup_conf(struct mddev *mddev)
 	int raid_disk, memory, max_disks;
 	struct md_rdev *rdev;
 	struct disk_info *disk;
+	char pers_name[6];
 
 	if (mddev->new_level != 5
 	    && mddev->new_level != 4
@@ -4963,7 +4964,8 @@ static struct r5conf *setup_conf(struct mddev *mddev)
 		printk(KERN_INFO "md/raid:%s: allocated %dkB\n",
 		       mdname(mddev), memory);
 
-	conf->thread = md_register_thread(raid5d, mddev, NULL);
+	sprintf(pers_name, "raid%d", mddev->new_level);
+	conf->thread = md_register_thread(raid5d, mddev, pers_name);
 	if (!conf->thread) {
 		printk(KERN_ERR
 		       "md/raid:%s: couldn't allocate thread.\n",