md-cluster: fix wrong condition check in raid1_write_request

[ Upstream commit 385f4d7f946b08f36f68b0a28e95a319925b6b62 ]

The check used here is to avoid conflict between write and
resync, however we used the wrong logic, it should be the
inverse of the checking inside "if".

Fixes: 589a1c4 ("Suspend writes in RAID1 if within range")
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index e4e8f9e..5a8216b 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -1309,12 +1309,12 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
                        sigset_t full, old;
                        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 ||
-                           (mddev_is_clustered(mddev) &&
+                       if ((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, WRITE,
-                                    bio->bi_iter.bi_sector,
-                                    bio_end_sector(bio))))
+                                                       bio->bi_iter.bi_sector,
+                                                       bio_end_sector(bio))))
                                break;
                        sigfillset(&full);
                        sigprocmask(SIG_BLOCK, &full, &old);