From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Date: Tue, 12 Aug 2014 15:13:19 +0000 (-0500)
Subject: Read from the first device when an area is resyncing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7d49ffcfa3cc08aa2301bf3fdb1e423a3fd33ee7;p=linux-beck.git

Read from the first device when an area is resyncing

set choose_first true for cluster read in read balance when the area
is resyncing.

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

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 3aa58ab5b1fd..f70d74189d16 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -539,7 +539,13 @@ static int read_balance(struct r1conf *conf, struct r1bio *r1_bio, int *max_sect
 	has_nonrot_disk = 0;
 	choose_next_idle = 0;
 
-	choose_first = (conf->mddev->recovery_cp < this_sector + sectors);
+	if ((conf->mddev->recovery_cp < this_sector + sectors) ||
+	    (mddev_is_clustered(conf->mddev) &&
+	    md_cluster_ops->area_resyncing(conf->mddev, this_sector,
+		    this_sector + sectors)))
+		choose_first = 1;
+	else
+		choose_first = 0;
 
 	for (disk = 0 ; disk < conf->raid_disks * 2 ; disk++) {
 		sector_t dist;