aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid1.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2015-02-19 00:04:40 -0500
committerNeilBrown <neilb@suse.de>2015-04-21 18:00:40 -0400
commit09314799e4f0589e52bafcd0ca3556c60468bc0e (patch)
tree012392cba7377a5db8c4c9e4c639337a6501cb46 /drivers/md/raid1.c
parent50c37b136a3807eda44afe16529b5af701ec49f5 (diff)
md: remove 'go_faster' option from ->sync_request()
This option is not well justified and testing suggests that it hardly ever makes any difference. The comment suggests there might be a need to wait for non-resync activity indicated by ->nr_waiting, however raise_barrier() already waits for all of that. So just remove it to simplify reasoning about speed limiting. This allows us to remove a 'FIXME' comment from raid5.c as that never used the flag. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md/raid1.c')
-rw-r--r--drivers/md/raid1.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 4efa50186a2a..9157a29c8dbf 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -2480,7 +2480,7 @@ static int init_resync(struct r1conf *conf)
2480 * that can be installed to exclude normal IO requests. 2480 * that can be installed to exclude normal IO requests.
2481 */ 2481 */
2482 2482
2483static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster) 2483static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped)
2484{ 2484{
2485 struct r1conf *conf = mddev->private; 2485 struct r1conf *conf = mddev->private;
2486 struct r1bio *r1_bio; 2486 struct r1bio *r1_bio;
@@ -2533,13 +2533,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp
2533 *skipped = 1; 2533 *skipped = 1;
2534 return sync_blocks; 2534 return sync_blocks;
2535 } 2535 }
2536 /*
2537 * If there is non-resync activity waiting for a turn,
2538 * and resync is going fast enough,
2539 * then let it though before starting on this new sync request.
2540 */
2541 if (!go_faster && conf->nr_waiting)
2542 msleep_interruptible(1000);
2543 2536
2544 bitmap_cond_end_sync(mddev->bitmap, sector_nr); 2537 bitmap_cond_end_sync(mddev->bitmap, sector_nr);
2545 r1_bio = mempool_alloc(conf->r1buf_pool, GFP_NOIO); 2538 r1_bio = mempool_alloc(conf->r1buf_pool, GFP_NOIO);