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

Commit a7c56eba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://neil.brown.name/md 

* 'for-linus' of git://neil.brown.name/md:
  md: Avoid waking up a thread after it has been freed.
parents 538d2882 01f96c0a

drivers/md/md.c

+19 −3
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ 
static void autostart_arrays(int part);

#endif



/* pers_list is a list of registered personalities protected

 * by pers_lock.

 * pers_lock does extra service to protect accesses to

 * mddev->thread when the mutex cannot be held.

 */

static LIST_HEAD(pers_list);

static DEFINE_SPINLOCK(pers_lock);
@@ -739,7 +744,12 @@ static void mddev_unlock(mddev_t * mddev) 
	} else

		mutex_unlock(&mddev->reconfig_mutex);



	/* was we've dropped the mutex we need a spinlock to

	 * make sur the thread doesn't disappear

	 */

	spin_lock(&pers_lock);

	md_wakeup_thread(mddev->thread);

	spin_unlock(&pers_lock);

}



static mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr)
@@ -6429,11 +6439,18 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev, 
	return thread;

}



void md_unregister_thread(mdk_thread_t *thread)

void md_unregister_thread(mdk_thread_t **threadp)

{

	mdk_thread_t *thread = *threadp;

	if (!thread)

		return;

	dprintk("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));

	/* Locking ensures that mddev_unlock does not wake_up a

	 * non-existent thread

	 */

	spin_lock(&pers_lock);

	*threadp = NULL;

	spin_unlock(&pers_lock);



	kthread_stop(thread->tsk);

	kfree(thread);
@@ -7340,8 +7357,7 @@ static void reap_sync_thread(mddev_t *mddev) 
	mdk_rdev_t *rdev;



	/* resync has finished, collect result */

	md_unregister_thread(mddev->sync_thread);

	mddev->sync_thread = NULL;

	md_unregister_thread(&mddev->sync_thread);

	if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&

	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {

		/* success...*/

drivers/md/md.h

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ extern int register_md_personality(struct mdk_personality *p); 
extern int unregister_md_personality(struct mdk_personality *p);

extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev),

				mddev_t *mddev, const char *name);

extern void md_unregister_thread(mdk_thread_t *thread);

extern void md_unregister_thread(mdk_thread_t **threadp);

extern void md_wakeup_thread(mdk_thread_t *thread);

extern void md_check_recovery(mddev_t *mddev);

extern void md_write_start(mddev_t *mddev, struct bio *bi);

drivers/md/multipath.c

+1 −2
Original line number Diff line number Diff line
@@ -514,8 +514,7 @@ static int multipath_stop (mddev_t *mddev) 
{

	multipath_conf_t *conf = mddev->private;



	md_unregister_thread(mddev->thread);

	mddev->thread = NULL;

	md_unregister_thread(&mddev->thread);

	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/

	mempool_destroy(conf->pool);

	kfree(conf->multipaths);

drivers/md/raid1.c

+1 −2
Original line number Diff line number Diff line
@@ -2562,8 +2562,7 @@ static int stop(mddev_t *mddev) 
	raise_barrier(conf);

	lower_barrier(conf);



	md_unregister_thread(mddev->thread);

	mddev->thread = NULL;

	md_unregister_thread(&mddev->thread);

	if (conf->r1bio_pool)

		mempool_destroy(conf->r1bio_pool);

	kfree(conf->mirrors);

drivers/md/raid10.c

+2 −3
Original line number Diff line number Diff line
@@ -2955,7 +2955,7 @@ static int run(mddev_t *mddev) 
	return 0;



out_free_conf:

	md_unregister_thread(mddev->thread);

	md_unregister_thread(&mddev->thread);

	if (conf->r10bio_pool)

		mempool_destroy(conf->r10bio_pool);

	safe_put_page(conf->tmppage);
@@ -2973,8 +2973,7 @@ static int stop(mddev_t *mddev) 
	raise_barrier(conf, 0);

	lower_barrier(conf);



	md_unregister_thread(mddev->thread);

	mddev->thread = NULL;

	md_unregister_thread(&mddev->thread);

	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/

	if (conf->r10bio_pool)

		mempool_destroy(conf->r10bio_pool);