drbd: always use_bmbv, ignore setting

Now that the peer may handle multi-bio EEs,
we can ignore the peer's limit,
and concentrate on the limits of the local IO stack.

This is safe accross drbd protocol versions,
as our queue_max_sectors() will be adjusted accordingly.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d8d9bbfca3b8..343e0e6dd532 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1110,7 +1110,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
         } else if (limit && get_ldev(mdev)) {
                 struct request_queue * const b =
                         mdev->ldev->backing_bdev->bd_disk->queue;
-                if (b->merge_bvec_fn && mdev->ldev->dc.use_bmbv) {
+                if (b->merge_bvec_fn) {
                         backing_limit = b->merge_bvec_fn(b, bvm, bvec);
                         limit = min(limit, backing_limit);
                 }