summaryrefslogtreecommitdiffstats
path: root/block/blk-wbt.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-11-10 21:50:51 -0700
committerJens Axboe <axboe@fb.com>2016-11-11 16:18:24 -0700
commit8054b89f8fca75d514965ee627a15b47020d2053 (patch)
treeeb5848111e22d9cd2cb81aacb3cc3a3fa7489cee /block/blk-wbt.h
parentd8a0cbfd73cb7281120d1b49f90afeef26ad48a2 (diff)
downloadlinux-0-day-8054b89f8fca75d514965ee627a15b47020d2053.tar.gz
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 <axboe@fb.com>
Diffstat (limited to 'block/blk-wbt.h')
-rw-r--r--block/blk-wbt.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/block/blk-wbt.h b/block/blk-wbt.h
index 09c61a3..44dc217 100644
--- a/block/blk-wbt.h
+++ b/block/blk-wbt.h
@@ -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;
}