1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index c24379ffd4e3..fec7bef44994 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1306,6 +1306,7 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
         int backing_limit;
 
         if (bio_size && get_ldev(mdev)) {
+                unsigned int max_hw_sectors = queue_max_hw_sectors(q);
                 struct request_queue * const b =
                         mdev->ldev->backing_bdev->bd_disk->queue;
                 if (b->merge_bvec_fn) {
@@ -1313,6 +1314,8 @@ int drbd_merge_bvec(struct request_queue *q, struct bvec_merge_data *bvm, struct
                         limit = min(limit, backing_limit);
                 }
                 put_ldev(mdev);
+                if ((limit >> 9) > max_hw_sectors)
+                        limit = max_hw_sectors << 9;
         }
         return limit;
 }