summaryrefslogtreecommitdiff
path: root/block/blk-rq-qos.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2019-08-29 01:05:54 +0300
committerJens Axboe <axboe@kernel.dk>2019-08-29 06:17:05 +0300
commitd3e65ffff61c329fb2d0bf15736c440c2d0cfc97 (patch)
tree2a105cbaeb09f223b4171644418b4d2697cf9ba2 /block/blk-rq-qos.c
parent015d254cb02b6d8eec4b3366274bf4672f9e0b64 (diff)
downloadlinux-d3e65ffff61c329fb2d0bf15736c440c2d0cfc97.tar.xz
block/rq_qos: add rq_qos_merge()
Add a merge hook for rq_qos. This will be used by io.weight. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-rq-qos.c')
-rw-r--r--block/blk-rq-qos.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index 3954c0dc1443..f4eea78f5cc1 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -83,6 +83,15 @@ void __rq_qos_track(struct rq_qos *rqos, struct request *rq, struct bio *bio)
} while (rqos);
}
+void __rq_qos_merge(struct rq_qos *rqos, struct request *rq, struct bio *bio)
+{
+ do {
+ if (rqos->ops->merge)
+ rqos->ops->merge(rqos, rq, bio);
+ rqos = rqos->next;
+ } while (rqos);
+}
+
void __rq_qos_done_bio(struct rq_qos *rqos, struct bio *bio)
{
do {