blk-wbt: remove stat ops

Again a leftover from when the throttling code was generic. Now that we
just have the block user, get rid of the stat ops and indirections.

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Jens Axboe 2016-11-10 21:50:51 -07:00
commit 8054b89f8f
3 changed files with 8 additions and 43 deletions

View file

@ -46,12 +46,6 @@ static inline bool wbt_is_read(struct blk_issue_stat *stat)
return (stat->time >> BLK_STAT_SHIFT) & WBT_READ;
}
struct wb_stat_ops {
void (*get)(void *, struct blk_rq_stat *);
bool (*is_current)(struct blk_rq_stat *);
void (*clear)(void *);
};
struct rq_wait {
wait_queue_head_t wait;
atomic_t inflight;
@ -89,9 +83,6 @@ struct rq_wb {
unsigned long min_lat_nsec;
struct request_queue *queue;
struct rq_wait rq_wait[WBT_NUM_RWQ];
struct wb_stat_ops *stat_ops;
void *ops_data;
};
static inline unsigned int wbt_inflight(struct rq_wb *rwb)
@ -109,7 +100,7 @@ static inline unsigned int wbt_inflight(struct rq_wb *rwb)
void __wbt_done(struct rq_wb *, enum wbt_flags);
void wbt_done(struct rq_wb *, struct blk_issue_stat *);
enum wbt_flags wbt_wait(struct rq_wb *, struct bio *, spinlock_t *);
int wbt_init(struct request_queue *, struct wb_stat_ops *);
int wbt_init(struct request_queue *);
void wbt_exit(struct request_queue *);
void wbt_update_limits(struct rq_wb *);
void wbt_requeue(struct rq_wb *, struct blk_issue_stat *);
@ -132,7 +123,7 @@ static inline enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio,
{
return 0;
}
static inline int wbt_init(struct request_queue *q, struct wb_stat_ops *ops)
static inline int wbt_init(struct request_queue *q)
{
return -EINVAL;
}