Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f81f7302 authored by Guoqing Jiang's avatar Guoqing Jiang Committed by Shaohua Li
Browse files

raid1: remove obsolete code in raid1_write_request 



There are some lines could be removed due to recent
change for raid1 such as commit 3956df15d634 ("md:
move suspend_hi/lo handling into core md code").

Also, seems some comments are put to wrong place,
move them before wait_barrier.

Signed-off-by: default avatarGuoqing Jiang <gqjiang@suse.com>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
parent 8db87912

drivers/md/raid1.c

+7 −13
Original line number Diff line number Diff line
@@ -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);