aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/md.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/md.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/md.c')
-rw-r--r--drivers/md/md.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3724a29eaf0e..3b9b032aa006 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7820,8 +7820,7 @@ void md_do_sync(struct md_thread *thread)
7820 if (test_bit(MD_RECOVERY_INTR, &mddev->recovery)) 7820 if (test_bit(MD_RECOVERY_INTR, &mddev->recovery))
7821 break; 7821 break;
7822 7822
7823 sectors = mddev->pers->sync_request(mddev, j, &skipped, 7823 sectors = mddev->pers->sync_request(mddev, j, &skipped);
7824 currspeed < speed_min(mddev));
7825 if (sectors == 0) { 7824 if (sectors == 0) {
7826 set_bit(MD_RECOVERY_INTR, &mddev->recovery); 7825 set_bit(MD_RECOVERY_INTR, &mddev->recovery);
7827 break; 7826 break;
@@ -7898,7 +7897,7 @@ void md_do_sync(struct md_thread *thread)
7898 wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active)); 7897 wait_event(mddev->recovery_wait, !atomic_read(&mddev->recovery_active));
7899 7898
7900 /* tell personality that we are finished */ 7899 /* tell personality that we are finished */
7901 mddev->pers->sync_request(mddev, max_sectors, &skipped, 1); 7900 mddev->pers->sync_request(mddev, max_sectors, &skipped);
7902 7901
7903 if (mddev_is_clustered(mddev)) 7902 if (mddev_is_clustered(mddev))
7904 md_cluster_ops->resync_finish(mddev); 7903 md_cluster_ops->resync_finish(mddev);