Suspend writes in RAID1 if within range

If there is a resync going on, all nodes must suspend writes to the
range. This is recorded in the suspend_info/suspend_list.

If there is an I/O within the ranges of any of the suspend_info,
should_suspend will return 1.

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4153da5d4011..3aa58ab5b1fd 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1101,8 +1101,10 @@ static void make_request(struct mddev *mddev, struct bio * bio)
         md_write_start(mddev, bio); /* wait on superblock update early */
 
         if (bio_data_dir(bio) == WRITE &&
-            bio_end_sector(bio) > mddev->suspend_lo &&
-            bio->bi_iter.bi_sector < mddev->suspend_hi) {
+            ((bio_end_sector(bio) > mddev->suspend_lo &&
+            bio->bi_iter.bi_sector < mddev->suspend_hi) ||
+            (mddev_is_clustered(mddev) &&
+             md_cluster_ops->area_resyncing(mddev, bio->bi_iter.bi_sector, bio_end_sector(bio))))) {
                 /* As the suspend_* range is controlled by
                  * userspace, we want an interruptible
                  * wait.
@@ -1113,7 +1115,10 @@ static void make_request(struct mddev *mddev, struct bio * bio)
                         prepare_to_wait(&conf->wait_barrier,
                                         &w, TASK_INTERRUPTIBLE);
                         if (bio_end_sector(bio) <= mddev->suspend_lo ||
-                            bio->bi_iter.bi_sector >= mddev->suspend_hi)
+                            bio->bi_iter.bi_sector >= mddev->suspend_hi ||
+                            (mddev_is_clustered(mddev) &&
+                             !md_cluster_ops->area_resyncing(mddev,
+                                     bio->bi_iter.bi_sector, bio_end_sector(bio))))
                                 break;
                         schedule();
                 }