diff options
| author | NeilBrown <neilb@suse.de> | 2015-02-19 16:04:40 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-04-22 08:00:40 +1000 |
| commit | 09314799e4f0589e52bafcd0ca3556c60468bc0e (patch) | |
| tree | 012392cba7377a5db8c4c9e4c639337a6501cb46 /drivers/md/raid1.c | |
| parent | 50c37b136a3807eda44afe16529b5af701ec49f5 (diff) | |
| download | op-kernel-dev-09314799e4f0589e52bafcd0ca3556c60468bc0e.zip op-kernel-dev-09314799e4f0589e52bafcd0ca3556c60468bc0e.tar.gz | |
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.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 4efa501..9157a29 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2480,7 +2480,7 @@ static int init_resync(struct r1conf *conf) * that can be installed to exclude normal IO requests. */ -static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster) +static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped) { struct r1conf *conf = mddev->private; struct r1bio *r1_bio; @@ -2533,13 +2533,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipp *skipped = 1; return sync_blocks; } - /* - * If there is non-resync activity waiting for a turn, - * and resync is going fast enough, - * then let it though before starting on this new sync request. - */ - if (!go_faster && conf->nr_waiting) - msleep_interruptible(1000); bitmap_cond_end_sync(mddev->bitmap, sector_nr); r1_bio = mempool_alloc(conf->r1buf_pool, GFP_NOIO); |
