From: NeilBrown <neilb@suse.de>
Date: Thu, 1 Mar 2007 04:11:42 +0000 (-0800)
Subject: [PATCH] md: clean out unplug and other queue function on md shutdown
X-Git-Tag: v2.6.21-rc3~190
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d1b5380c7f794da16e815c34e54ee7641db8a288;p=linux-2.6-omap-h63xx.git

[PATCH] md: clean out unplug and other queue function on md shutdown

The mddev and queue might be used for another array which does not set these,
so they need to be cleared.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/md/md.c b/drivers/md/md.c
index c8c40c36153..b5744b1bd2b 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3322,6 +3322,9 @@ static int do_md_stop(mddev_t * mddev, int mode)
 				set_disk_ro(disk, 0);
 			blk_queue_make_request(mddev->queue, md_fail_request);
 			mddev->pers->stop(mddev);
+			mddev->queue->merge_bvec_fn = NULL;
+			mddev->queue->unplug_fn = NULL;
+			mddev->queue->issue_flush_fn = NULL;
 			if (mddev->pers->sync_request)
 				sysfs_remove_group(&mddev->kobj, &md_redundancy_group);