diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-02-01 20:27:02 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-02-01 20:27:02 -0700 |
| commit | 3c15f3f545afa320c5e3822825a9a53c664776b6 (patch) | |
| tree | c6e0a7d7299e8012c2bf77e396aae40455d77d13 /block/blk-mq-sched.c | |
| parent | 4bf772b14675411a69b3c807f73006de0fe4b649 (diff) | |
| parent | bea99a500773fdfdb16b7dbfbaa00af7a6f0dc3b (diff) | |
Merge branch 'for-linus' into test
* for-linus:
blk-mq-sched: Enable merging discard bio into request
blk-mq: fix discard merge with scheduler attached
blk-mq: introduce BLK_STS_DEV_RESOURCE
Diffstat (limited to 'block/blk-mq-sched.c')
| -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; } |