diff options
| author | Keith Busch <keith.busch@intel.com> | 2018-02-01 22:41:15 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-01 22:45:11 +0100 |
| commit | bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b (patch) | |
| tree | 1290fec98ae3751dd6ea9cc787c73c5ece62f0ff /block | |
| parent | blk-mq: fix discard merge with scheduler attached (diff) | |
| download | linux-bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b.tar.xz linux-bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b.zip | |
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>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq-sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 55c0a745b427..25c14c58385c 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; } |