From 84891826f2be82c9fc225c6f09be8c607745795f Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Sun, 10 Dec 2006 02:20:44 -0800
Subject: [PATCH] --- yaml --- r: 43995 b: refs/heads/master c:
 0d4ca600fcf5c5f3a0c195ccf37e989b83451dd4 h: refs/heads/master i:   43993:
 a2fe404c90826a31bb143d9e36b5ea65b4485f92   43991:
 291ca6c6b576c541274a15562d0d94baf0cf1d85 v: v3

---
 [refs]                |  2 +-
 trunk/drivers/md/md.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 806eff11691c..e9be631955d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3d899839064b6924c3d8a6404dae14c79f657fd
+refs/heads/master: 0d4ca600fcf5c5f3a0c195ccf37e989b83451dd4
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 53bd46dba0cb..08c2d78e5737 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -3314,6 +3314,10 @@ static int do_md_stop(mddev_t * mddev, int mode)
 
 			module_put(mddev->pers->owner);
 			mddev->pers = NULL;
+
+			set_capacity(disk, 0);
+			mddev->changed = 1;
+
 			if (mddev->ro)
 				mddev->ro = 0;
 		}
@@ -3333,7 +3337,7 @@ static int do_md_stop(mddev_t * mddev, int mode)
 	if (mode == 0) {
 		mdk_rdev_t *rdev;
 		struct list_head *tmp;
-		struct gendisk *disk;
+
 		printk(KERN_INFO "md: %s stopped.\n", mdname(mddev));
 
 		bitmap_destroy(mddev);
@@ -3358,10 +3362,6 @@ static int do_md_stop(mddev_t * mddev, int mode)
 		mddev->raid_disks = 0;
 		mddev->recovery_cp = 0;
 
-		disk = mddev->gendisk;
-		if (disk)
-			set_capacity(disk, 0);
-		mddev->changed = 1;
 	} else if (mddev->pers)
 		printk(KERN_INFO "md: %s switched to read-only mode.\n",
 			mdname(mddev));