Signed-off-by: Alan D. Brunelle --- block/blk-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 2a438a9..54a2d8b 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1115,7 +1115,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) spin_lock_irq(q->queue_lock); - if (unlikely(barrier) || elv_queue_empty(q)) + if (blk_queue_nomerges(q) || unlikely(barrier) || elv_queue_empty(q)) goto get_rq; el_ret = elv_merge(q, &req, bio); -- 1.5.2.5