aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--block/elevator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 84d63943f2de..c3555c9c672f 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -420,7 +420,7 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio)
420 * noxmerges: Only simple one-hit cache try 420 * noxmerges: Only simple one-hit cache try
421 * merges: All merge tries attempted 421 * merges: All merge tries attempted
422 */ 422 */
423 if (blk_queue_nomerges(q)) 423 if (blk_queue_nomerges(q) || !bio_mergeable(bio))
424 return ELEVATOR_NO_MERGE; 424 return ELEVATOR_NO_MERGE;
425 425
426 /* 426 /*