diff options
| author | Josef Bacik <jbacik@fb.com> | 2018-07-03 11:14:59 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-07-09 09:07:54 -0600 |
| commit | c1c80384c8f47021a01a0cc42894a06bed2b801b (patch) | |
| tree | e3fb3b3ddf6c58eea32d49989875ca39c0ba382c /block/blk-rq-qos.h | |
| parent | a79050434b45959f397042080fd1d70ffa9bd9df (diff) | |
| download | lwn-c1c80384c8f47021a01a0cc42894a06bed2b801b.tar.gz lwn-c1c80384c8f47021a01a0cc42894a06bed2b801b.zip | |
block: remove external dependency on wbt_flags
We don't really need to save this stuff in the core block code, we can
just pass the bio back into the helpers later on to derive the same
flags and update the rq->wbt_flags appropriately.
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-rq-qos.h')
| -rw-r--r-- | block/blk-rq-qos.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index f9a39bd6ece3..a6d13b8ce0dc 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -25,12 +25,12 @@ struct rq_qos { }; struct rq_qos_ops { - enum wbt_flags (*throttle)(struct rq_qos *, struct bio *, - spinlock_t *); + void (*throttle)(struct rq_qos *, struct bio *, spinlock_t *); + void (*track)(struct rq_qos *, struct request *, struct bio *); void (*issue)(struct rq_qos *, struct request *); void (*requeue)(struct rq_qos *, struct request *); void (*done)(struct rq_qos *, struct request *); - void (*cleanup)(struct rq_qos *, enum wbt_flags); + void (*cleanup)(struct rq_qos *, struct bio *); void (*exit)(struct rq_qos *); }; @@ -97,10 +97,11 @@ void rq_depth_scale_up(struct rq_depth *rqd); void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle); bool rq_depth_calc_max_depth(struct rq_depth *rqd); -void rq_qos_cleanup(struct request_queue *, enum wbt_flags); +void rq_qos_cleanup(struct request_queue *, struct bio *); void rq_qos_done(struct request_queue *, struct request *); void rq_qos_issue(struct request_queue *, struct request *); void rq_qos_requeue(struct request_queue *, struct request *); -enum wbt_flags rq_qos_throttle(struct request_queue *, struct bio *, spinlock_t *); +void rq_qos_throttle(struct request_queue *, struct bio *, spinlock_t *); +void rq_qos_track(struct request_queue *q, struct request *, struct bio *); void rq_qos_exit(struct request_queue *); #endif |