From: Keith Busch <keith.busch@intel.com>
Date: Thu, 1 Feb 2018 21:41:15 +0000 (-0700)
Subject: blk-mq-sched: Enable merging discard bio into request
X-Git-Tag: v4.16-rc1~7^2~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b;p=users%2Fdwmw2%2Flinux.git

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

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 55c0a745b4277..25c14c58385c8 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -259,6 +259,8 @@ bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
 		if (!*merged_request)
 			elv_merged_request(q, rq, ELEVATOR_FRONT_MERGE);
 		return true;
+	case ELEVATOR_DISCARD_MERGE:
+		return bio_attempt_discard_merge(q, rq, bio);
 	default:
 		return false;
 	}