diff --git a/[refs] b/[refs] index fd66e2088b3a..ed0370d8719c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fafd7fb052182e087b5a3c6c408e4ac8c2b5fa14 +refs/heads/master: 9e35b99c7efacfddc748c89a0c53b1122b0ee72c diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index d3579fc9efed..af0780ae56b5 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/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)