diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-09-09 08:22:21 -0400 |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 12:38:38 -0400 |
| commit | 5a75cc7cfbb98e896232902214432dae30653dfe (patch) | |
| tree | 278a4625bc5ba0bd406357c2ef4450e9c98eb188 /drivers/block | |
| parent | f2906e183f5460df9d9e774f5952f5ff670b3913 (diff) | |
drbd: Fixed compatibility with protocol versions smaller than 95
Forgot to consider the max size for the resync requests.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index c72a5fc1c88e..daa672fc46e9 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
| @@ -534,8 +534,9 @@ int w_make_resync_request(struct drbd_conf *mdev, | |||
| 534 | 534 | ||
| 535 | /* starting with drbd 8.3.8, we can handle multi-bio EEs, | 535 | /* starting with drbd 8.3.8, we can handle multi-bio EEs, |
| 536 | * if it should be necessary */ | 536 | * if it should be necessary */ |
| 537 | max_segment_size = mdev->agreed_pro_version < 94 ? | 537 | max_segment_size = |
| 538 | queue_max_segment_size(mdev->rq_queue) : DRBD_MAX_SEGMENT_SIZE; | 538 | mdev->agreed_pro_version < 94 ? queue_max_segment_size(mdev->rq_queue) : |
| 539 | mdev->agreed_pro_version < 95 ? DRBD_MAX_SIZE_H80_PACKET : DRBD_MAX_SEGMENT_SIZE; | ||
| 539 | 540 | ||
| 540 | if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */ | 541 | if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */ |
| 541 | number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9); | 542 | number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9); |