Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7460d389 authored by Ming Lei's avatar Ming Lei Committed by Jens Axboe
Browse files

block: check bio_mergeable() early before merging 



After bio splitting is introduced, one bio can be splitted
and it is marked as NOMERGE because it is too fat to be merged,
so check bio_mergeable() earlier to avoid to try to merge it
unnecessarily.

Signed-off-by: default avatarMing Lei <ming.lei@canonical.com>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e18378a6

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ int elv_merge(struct request_queue *q, struct request **req, struct bio *bio) 
	 * 	noxmerges: Only simple one-hit cache try

	 * 	merges:	   All merge tries attempted

	 */

	if (blk_queue_nomerges(q))

	if (blk_queue_nomerges(q) || !bio_mergeable(bio))

		return ELEVATOR_NO_MERGE;



	/*