From: NeilBrown Date: Tue, 6 Apr 2010 04:23:02 +0000 (+1000) Subject: md: don't unregister the thread in mddev_suspend X-Git-Tag: v2.6.35-rc1~440^2~17 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9e35b99c7efacfddc748c89a0c53b1122b0ee72c;p=linux-2.6-block.git md: don't unregister the thread in mddev_suspend This is - unnecessary because mddev_suspend is always followed by a call to ->stop, and each ->stop unregisters the thread, and - a problem as it makes it awkwards to suspend and then resume a device as we will want later. Signed-off-by: NeilBrown --- diff --git a/drivers/md/md.c b/drivers/md/md.c index d3579fc9efed..af0780ae56b5 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -254,6 +254,12 @@ static int md_make_request(struct request_queue *q, struct bio *bio) return rv; } +/* mddev_suspend makes sure no new requests are submitted + * to the device, and that any requests that have been submitted + * are completely handled. + * Once ->stop is called and completes, the module will be completely + * unused. + */ static void mddev_suspend(mddev_t *mddev) { BUG_ON(mddev->suspended); @@ -261,13 +267,6 @@ static void mddev_suspend(mddev_t *mddev) synchronize_rcu(); wait_event(mddev->sb_wait, atomic_read(&mddev->active_io) == 0); mddev->pers->quiesce(mddev, 1); - md_unregister_thread(mddev->thread); - mddev->thread = NULL; - /* we now know that no code is executing in the personality module, - * except possibly the tail end of a ->bi_end_io function, but that - * is certain to complete before the module has a chance to get - * unloaded - */ } static void mddev_resume(mddev_t *mddev)