Commit bea99a50 authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe
Browse files

blk-mq-sched: Enable merging discard bio into request 



Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 445251d0

block/blk-mq-sched.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, 
		if (!*merged_request)

		if (!*merged_request)

			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);

			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);

		return true;

		return true;

	case ELEVATOR_DISCARD_MERGE:

		return bio_attempt_discard_merge(q, rq, bio);

	default:

	default:

		return false;

		return false;

	}

	}