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/raid10.c | |
| parent | 50c37b136a3807eda44afe16529b5af701ec49f5 (diff) | |
| download | talos-obmc-linux-09314799e4f0589e52bafcd0ca3556c60468bc0e.tar.gz talos-obmc-linux-09314799e4f0589e52bafcd0ca3556c60468bc0e.zip | |
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/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index a7196c49d15d..e793ab6b3570 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -2889,7 +2889,7 @@ static int init_resync(struct r10conf *conf) */ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, - int *skipped, int go_faster) + int *skipped) { struct r10conf *conf = mddev->private; struct r10bio *r10_bio; @@ -2994,12 +2994,6 @@ static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, if (conf->geo.near_copies < conf->geo.raid_disks && max_sector > (sector_nr | chunk_mask)) max_sector = (sector_nr | chunk_mask) + 1; - /* - * If there is non-resync activity waiting for us then - * put in a delay to throttle resync. - */ - if (!go_faster && conf->nr_waiting) - msleep_interruptible(1000); /* Again, very different code for resync and recovery. * Both must result in an r10bio with a list of bios that |
