Skip to contentSkip to conversation

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

PATCH In review Keith Busch 2 participants 2 messages Feb 1, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 blk-mq-sched: Enable merging discard bio into request

---
 block/blk-mq-sched.c | 2 ++
 1 file changed, 2 insertions(+)
block/blk-mq-sched.c +2 -0
index 55c0a745b427..25c14c58385c 100644
@@ -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;
 	}
Signature · 1 line
2.14.3
maintainer
#1 lore raw
Quoted 10 lines · Keith Busch
---
 block/blk-mq-sched.c | 2 ++
 1 file changed, 2 insertions(+)
block/blk-mq-sched.c +0 -0
index 55c0a745b427..25c14c58385c 100644

block/blk-mq-sched.c bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio, · line 265

Quoted 7 lines
block/blk-mq-sched.c +2 -0
@@ -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;

Thanks Keith, applied.

Signature · 1 line
Jens Axboe