md: factor md_stop_writes out of do_md_stop.

Further refactoring of do_md_stop.
This one requires some explanation as it takes code from different
places in do_md_stop, so some re-ordering happens.

We only get into this part of do_md_stop if there are no active opens
of the device, so no writes can be happening and the device must have
been flushed.  In md_stop_writes we want to stop any internal sources
of writes - i.e. resync - and flush out the metadata.

The only code that was previously before some of this code is
code to clean up the queue, the mddev, the gendisk, or sysfs, all
of which is probably better after code that makes active changes (i.e.
triggers writes).

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 002d0a34d6ea8914805131645839e71704eca5f5..86dfbc361cc03a2520e6e51d54a35f9f10f503ee 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4610,6 +4610,27 @@ static void md_clean(mddev_t *mddev)
        mddev->bitmap_info.max_write_behind = 0;
 }
 
+static void md_stop_writes(mddev_t *mddev)
+{
+       if (mddev->sync_thread) {
+               set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
+               set_bit(MD_RECOVERY_INTR, &mddev->recovery);
+               md_unregister_thread(mddev->sync_thread);
+               mddev->sync_thread = NULL;
+       }
+
+       del_timer_sync(&mddev->safemode_timer);
+
+       bitmap_flush(mddev);
+       md_super_wait(mddev);
+
+       if (!mddev->in_sync || mddev->flags) {
+               /* mark array as shutdown cleanly */
+               mddev->in_sync = 1;
+               md_update_sb(mddev, 1);
+       }
+}
+
 static void md_stop(mddev_t *mddev)
 {
        mddev->pers->stop(mddev);
@@ -4637,14 +4658,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                err = -EBUSY;
        } else if (mddev->pers) {
 
-               if (mddev->sync_thread) {
-                       set_bit(MD_RECOVERY_FROZEN, &mddev->recovery);
-                       set_bit(MD_RECOVERY_INTR, &mddev->recovery);
-                       md_unregister_thread(mddev->sync_thread);
-                       mddev->sync_thread = NULL;
-               }
-
-               del_timer_sync(&mddev->safemode_timer);
+               md_stop_writes(mddev);
 
                switch(mode) {
                case 1: /* readonly */
@@ -4655,8 +4669,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                        break;
                case 0: /* disassemble */
                case 2: /* stop */
-                       bitmap_flush(mddev);
-                       md_super_wait(mddev);
                        if (mddev->ro)
                                set_disk_ro(disk, 0);
 
@@ -4681,11 +4693,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                        if (mddev->ro)
                                mddev->ro = 0;
                }
-               if (!mddev->in_sync || mddev->flags) {
-                       /* mark array as shutdown cleanly */
-                       mddev->in_sync = 1;
-                       md_update_sb(mddev, 1);
-               }
                if (mode == 1)
                        set_disk_ro(disk, 1);
                clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery);