]> err.no Git - linux-2.6/commitdiff
Restore force switch of md array to readonly at reboot time.
authorNeilBrown <neilb@suse.de>
Tue, 5 Aug 2008 05:54:13 +0000 (15:54 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 5 Aug 2008 05:56:31 +0000 (15:56 +1000)
A recent patch allowed do_md_stop to know whether it was being called
via an ioctl or not, and thus where to allow for an extra open file
descriptor when checking if it is in use.
This broke then switch to readonly performed by the shutdown notifier,
which needs to work even when the array is still (apparently) active
(as md doesn't get told when the filesystem becomes readonly).

So restore this feature by pretending that there can be lots of
file descriptors open, but we still want do_md_stop to switch to
readonly.

Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/md.c

index 48afe4f7ad4c2d3538b85ec8234abfdd7c194845..8d11cd1a0d8b182fda9a9b99b0056cd03f58a361 100644 (file)
@@ -6237,7 +6237,11 @@ static int md_notify_reboot(struct notifier_block *this,
 
                for_each_mddev(mddev, tmp)
                        if (mddev_trylock(mddev)) {
-                               do_md_stop (mddev, 1, 0);
+                               /* Force a switch to readonly even array
+                                * appears to still be in use.  Hence
+                                * the '100'.
+                                */
+                               do_md_stop (mddev, 1, 100);
                                mddev_unlock(mddev);
                        }
                /*