diff options
| author |   Lars Ellenberg <lars.ellenberg@linbit.com> | 2010-11-05 10:05:47 +0100 |
|---|---|---|
| committer |   Philipp Reisner <philipp.reisner@linbit.com> | 2011-03-10 11:19:03 +0100 |
| commit | 2649f0809f55e4df98c333a2b85c6fc8fee04804 (patch) | |
| tree | b275b9af4122fe84965d754b27615c71c8a13a60 /drivers/block/drbd/drbd_worker.c | |
| parent | drbd: factor out drbd_rs_number_requests (diff) | |
| download | linux-dev-2649f0809f55e4df98c333a2b85c6fc8fee04804.tar.xz linux-dev-2649f0809f55e4df98c333a2b85c6fc8fee04804.zip | |
drbd: use the resync controller for online-verify requests as well
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 6d111c8515f7..af805efc94d7 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -708,11 +708,7 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca return 0; } - number = SLEEP_TIME*mdev->sync_conf.rate / ((BM_BLOCK_SIZE/1024)*HZ); - if (atomic_read(&mdev->rs_pending_cnt) > number) - goto requeue; - - number -= atomic_read(&mdev->rs_pending_cnt); + number = drbd_rs_number_requests(mdev); sector = mdev->ov_position; for (i = 0; i < number; i++) { @@ -741,11 +737,11 @@ static int w_make_ov_request(struct drbd_conf *mdev, struct drbd_work *w, int ca mdev->ov_position = sector; requeue: + mdev->rs_in_flight += (i << (BM_BLOCK_SHIFT - 9)); mod_timer(&mdev->resync_timer, jiffies + SLEEP_TIME); return 1; } - int w_ov_finished(struct drbd_conf *mdev, struct drbd_work *w, int cancel) { kfree(w); |