diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 12:10:50 +0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-06-30 12:10:50 +0400 |
| commit | 7b28afe01ab6ffb5f152f47831b44933facd2328 (patch) | |
| tree | a537d78f49fa1b959c9a453f459c1acd767a939f /drivers/block/drbd/drbd_worker.c | |
| parent | 726e99ab88db059fe1422e15376ae404f8c66eb4 (diff) | |
| parent | 86e1e98e5c6b4edab97e2b058466ef553cfd878e (diff) | |
| download | linux-7b28afe01ab6ffb5f152f47831b44933facd2328.tar.xz | |
Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
| -rw-r--r-- | drivers/block/drbd/drbd_worker.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 4d76b06b6b20..4d3e6f6213ba 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c @@ -536,12 +536,7 @@ static int w_make_resync_request(struct drbd_conf *mdev, return 1; } - /* starting with drbd 8.3.8, we can handle multi-bio EEs, - * if it should be necessary */ - max_bio_size = - mdev->agreed_pro_version < 94 ? queue_max_hw_sectors(mdev->rq_queue) << 9 : - mdev->agreed_pro_version < 95 ? DRBD_MAX_SIZE_H80_PACKET : DRBD_MAX_BIO_SIZE; - + max_bio_size = queue_max_hw_sectors(mdev->rq_queue) << 9; number = drbd_rs_number_requests(mdev); if (number == 0) goto requeue; |