|
@@ -1286,27 +1286,15 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
|
|
|
int first_clone;
|
|
|
int max_sectors;
|
|
|
|
|
|
- /*
|
|
|
- * Register the new request and wait if the reconstruction
|
|
|
- * thread has put up a bar for new requests.
|
|
|
- * Continue immediately if no resync is active currently.
|
|
|
- */
|
|
|
-
|
|
|
-
|
|
|
if (mddev_is_clustered(mddev) &&
|
|
|
md_cluster_ops->area_resyncing(mddev, WRITE,
|
|
|
bio->bi_iter.bi_sector, bio_end_sector(bio))) {
|
|
|
|
|
|
- /*
|
|
|
- * As the suspend_* range is controlled by userspace, we want
|
|
|
- * an interruptible wait.
|
|
|
- */
|
|
|
DEFINE_WAIT(w);
|
|
|
for (;;) {
|
|
|
prepare_to_wait(&conf->wait_barrier,
|
|
|
&w, TASK_IDLE);
|
|
|
- if (!mddev_is_clustered(mddev) ||
|
|
|
- !md_cluster_ops->area_resyncing(mddev, WRITE,
|
|
|
+ if (!md_cluster_ops->area_resyncing(mddev, WRITE,
|
|
|
bio->bi_iter.bi_sector,
|
|
|
bio_end_sector(bio)))
|
|
|
break;
|
|
@@ -1314,6 +1302,12 @@ static void raid1_write_request(struct mddev *mddev, struct bio *bio,
|
|
|
}
|
|
|
finish_wait(&conf->wait_barrier, &w);
|
|
|
}
|
|
|
+
|
|
|
+ /*
|
|
|
+ * Register the new request and wait if the reconstruction
|
|
|
+ * thread has put up a bar for new requests.
|
|
|
+ * Continue immediately if no resync is active currently.
|
|
|
+ */
|
|
|
wait_barrier(conf, bio->bi_iter.bi_sector);
|
|
|
|
|
|
r1_bio = alloc_r1bio(mddev, bio);
|