md: factor out a helper to sync mddev

[linux-2.6-microblaze.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9f97e40..4d58e34 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -529,6 +529,24 @@ void mddev_resume(struct mddev *mddev)
 }
 EXPORT_SYMBOL_GPL(mddev_resume);
 
+/* sync bdev before setting device to readonly or stopping raid*/
+static int mddev_set_closing_and_sync_blockdev(struct mddev *mddev, int opener_num)
+{
+       mutex_lock(&mddev->open_mutex);
+       if (mddev->pers && atomic_read(&mddev->openers) > opener_num) {
+               mutex_unlock(&mddev->open_mutex);
+               return -EBUSY;
+       }
+       if (test_and_set_bit(MD_CLOSING, &mddev->flags)) {
+               mutex_unlock(&mddev->open_mutex);
+               return -EBUSY;
+       }
+       mutex_unlock(&mddev->open_mutex);
+
+       sync_blockdev(mddev->gendisk->part0);
+       return 0;
+}
+
 /*
  * Generic flush handling for md
  */
@@ -7658,17 +7676,9 @@ static int md_ioctl(struct block_device *bdev, blk_mode_t mode,
                /* Need to flush page cache, and ensure no-one else opens
                 * and writes
                 */
-               mutex_lock(&mddev->open_mutex);
-               if (mddev->pers && atomic_read(&mddev->openers) > 1) {
-                       mutex_unlock(&mddev->open_mutex);
-                       return -EBUSY;
-               }
-               if (test_and_set_bit(MD_CLOSING, &mddev->flags)) {
-                       mutex_unlock(&mddev->open_mutex);
-                       return -EBUSY;
-               }
-               mutex_unlock(&mddev->open_mutex);
-               sync_blockdev(bdev);
+               err = mddev_set_closing_and_sync_blockdev(mddev, 1);
+               if (err)
+                       return err;
        }
 
        if (!md_is_rdwr(mddev))