From b5175d338932651fac7a127d2ae6bc87eb2e862e Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 9 Sep 2010 14:22:21 +0200 Subject: [PATCH] --- yaml --- r: 213145 b: refs/heads/master c: 5a75cc7cfbb98e896232902214432dae30653dfe h: refs/heads/master i: 213143: 3c8d5ce21f6884e3a723e147b572e2aaba21fa8a v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 79787caf9c3b..1f7bec9420ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2906e183f5460df9d9e774f5952f5ff670b3913 +refs/heads/master: 5a75cc7cfbb98e896232902214432dae30653dfe diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index c72a5fc1c88e..daa672fc46e9 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -534,8 +534,9 @@ int w_make_resync_request(struct drbd_conf *mdev, /* starting with drbd 8.3.8, we can handle multi-bio EEs, * if it should be necessary */ - max_segment_size = mdev->agreed_pro_version < 94 ? - queue_max_segment_size(mdev->rq_queue) : DRBD_MAX_SEGMENT_SIZE; + max_segment_size = + mdev->agreed_pro_version < 94 ? queue_max_segment_size(mdev->rq_queue) : + mdev->agreed_pro_version < 95 ? DRBD_MAX_SIZE_H80_PACKET : DRBD_MAX_SEGMENT_SIZE; if (mdev->rs_plan_s.size) { /* mdev->sync_conf.c_plan_ahead */ number = drbd_rs_controller(mdev) >> (BM_BLOCK_SHIFT - 9);