---

yaml --- r: 139923 b: refs/heads/master c: e0cf8f0 h: refs/heads/master i: 139921: 790b049 139919: 2883b2c v: v3
git-mirror · Mar 31, 2009 · 2d3cb18 · 2d3cb18
1 parent 2401120
commit 2d3cb18
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91adb56473febeeb3ef657bb5147ddd355465700
+refs/heads/master: e0cf8f045b2023b0b3f919ee93eb94345f648434
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -5382,6 +5382,8 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev,
 
 void md_unregister_thread(mdk_thread_t *thread)
 {
+	if (!thread)
+		return;
 	dprintk("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));
 
 	kthread_stop(thread->tsk);

diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -4463,8 +4463,7 @@ static int run(mddev_t *mddev)
 
 	return 0;
 abort:
-	if (mddev->thread)
-		md_unregister_thread(mddev->thread);
+	md_unregister_thread(mddev->thread);
 	mddev->thread = NULL;
 	if (conf) {
 		shrink_stripes(conf);