1 files changed, 17 insertions, 3 deletions

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 8fda38d23e38..34846856dbc6 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3448,6 +3448,8 @@ level_store(struct mddev *mddev, const char *buf, size_t len)
                 mddev->level = LEVEL_NONE;
                 return rv;
         }
+        if (mddev->ro)
+                return  -EROFS;
 
         /* request to change the personality.  Need to ensure:
          *  - array is not engaged in resync/recovery/reshape
@@ -3634,6 +3636,8 @@ layout_store(struct mddev *mddev, const char *buf, size_t len)
                 int err;
                 if (mddev->pers->check_reshape == NULL)
                         return -EBUSY;
+                if (mddev->ro)
+                        return -EROFS;
                 mddev->new_layout = n;
                 err = mddev->pers->check_reshape(mddev);
                 if (err) {
@@ -3723,6 +3727,8 @@ chunk_size_store(struct mddev *mddev, const char *buf, size_t len)
                 int err;
                 if (mddev->pers->check_reshape == NULL)
                         return -EBUSY;
+                if (mddev->ro)
+                        return -EROFS;
                 mddev->new_chunk_sectors = n >> 9;
                 err = mddev->pers->check_reshape(mddev);
                 if (err) {
@@ -6135,6 +6141,8 @@ static int update_size(struct mddev *mddev, sector_t num_sectors)
          */
         if (mddev->sync_thread)
                 return -EBUSY;
+        if (mddev->ro)
+                return -EROFS;
 
         rdev_for_each(rdev, mddev) {
                 sector_t avail = rdev->sectors;
@@ -6157,6 +6165,8 @@ static int update_raid_disks(struct mddev *mddev, int raid_disks)
         /* change the number of raid disks */
         if (mddev->pers->check_reshape == NULL)
                 return -EINVAL;
+        if (mddev->ro)
+                return -EROFS;
         if (raid_disks <= 0 ||
             (mddev->max_disks && raid_disks >= mddev->max_disks))
                 return -EINVAL;
@@ -7381,8 +7391,10 @@ void md_do_sync(struct md_thread *thread)
         /* just incase thread restarts... */
         if (test_bit(MD_RECOVERY_DONE, &mddev->recovery))
                 return;
-        if (mddev->ro) /* never try to sync a read-only array */
+        if (mddev->ro) {/* never try to sync a read-only array */
+                set_bit(MD_RECOVERY_INTR, &mddev->recovery);
                 return;
+        }
 
         if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
                 if (test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) {
@@ -7824,6 +7836,7 @@ void md_check_recovery(struct mddev *mddev)
                         /* There is no thread, but we need to call
                          * ->spare_active and clear saved_raid_disk
                          */
+                        set_bit(MD_RECOVERY_INTR, &mddev->recovery);
                         md_reap_sync_thread(mddev);
                         clear_bit(MD_RECOVERY_NEEDED, &mddev->recovery);
                         goto unlock;
@@ -8330,7 +8343,7 @@ static int md_clear_badblocks(struct badblocks *bb, sector_t s, int sectors)
                         if (a < s) {
                                 /* we need to split this range */
                                 if (bb->count >= MD_MAX_BADBLOCKS) {
-                                        rv = 0;
+                                        rv = -ENOSPC;
                                         goto out;
                                 }
                                 memmove(p+lo+1, p+lo, (bb->count - lo) * 8);
@@ -8516,7 +8529,8 @@ static int md_notify_reboot(struct notifier_block *this,
                 if (mddev_trylock(mddev)) {
                         if (mddev->pers)
                                 __md_stop_writes(mddev);
-                        mddev->safemode = 2;
+                        if (mddev->persistent)
+                                mddev->safemode = 2;
                         mddev_unlock(mddev);
                 }
                 need_delay = 1;