mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 16:13:19 +09:00
blk-stat: kill blk_stat_rq_ddir()
No point in providing and exporting this helper. There's just one (real) user of it, just use rq_data_dir(). Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
@@ -46,7 +46,7 @@ static int blk_mq_poll_stats_bkt(const struct request *rq)
|
|||||||
{
|
{
|
||||||
int ddir, bytes, bucket;
|
int ddir, bytes, bucket;
|
||||||
|
|
||||||
ddir = blk_stat_rq_ddir(rq);
|
ddir = rq_data_dir(rq);
|
||||||
bytes = blk_rq_bytes(rq);
|
bytes = blk_rq_bytes(rq);
|
||||||
|
|
||||||
bucket = ddir + 2*(ilog2(bytes) - 9);
|
bucket = ddir + 2*(ilog2(bytes) - 9);
|
||||||
|
|||||||
@@ -19,12 +19,6 @@ struct blk_queue_stats {
|
|||||||
bool enable_accounting;
|
bool enable_accounting;
|
||||||
};
|
};
|
||||||
|
|
||||||
int blk_stat_rq_ddir(const struct request *rq)
|
|
||||||
{
|
|
||||||
return rq_data_dir(rq);
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(blk_stat_rq_ddir);
|
|
||||||
|
|
||||||
static void blk_stat_init(struct blk_rq_stat *stat)
|
static void blk_stat_init(struct blk_rq_stat *stat)
|
||||||
{
|
{
|
||||||
stat->min = -1ULL;
|
stat->min = -1ULL;
|
||||||
|
|||||||
@@ -112,17 +112,6 @@ static inline void blk_stat_set_issue(struct blk_issue_stat *stat,
|
|||||||
/* record time/size info in request but not add a callback */
|
/* record time/size info in request but not add a callback */
|
||||||
void blk_stat_enable_accounting(struct request_queue *q);
|
void blk_stat_enable_accounting(struct request_queue *q);
|
||||||
|
|
||||||
/*
|
|
||||||
* blk_stat_rq_ddir() - Bucket callback function for the request data direction.
|
|
||||||
* @rq: Request.
|
|
||||||
*
|
|
||||||
* This is the same as rq_data_dir() but as a function so it can be used as
|
|
||||||
* @bucket_fn for blk_stat_alloc_callback().
|
|
||||||
*
|
|
||||||
* Return: Data direction of the request, either READ or WRITE.
|
|
||||||
*/
|
|
||||||
int blk_stat_rq_ddir(const struct request *rq);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* blk_stat_alloc_callback() - Allocate a block statistics callback.
|
* blk_stat_alloc_callback() - Allocate a block statistics callback.
|
||||||
* @timer_fn: Timer callback function.
|
* @timer_fn: Timer callback function.
|
||||||
|
|||||||
@@ -696,6 +696,11 @@ u64 wbt_default_latency_nsec(struct request_queue *q)
|
|||||||
return 75000000ULL;
|
return 75000000ULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int wbt_data_dir(const struct request *rq)
|
||||||
|
{
|
||||||
|
return rq_data_dir(rq);
|
||||||
|
}
|
||||||
|
|
||||||
int wbt_init(struct request_queue *q)
|
int wbt_init(struct request_queue *q)
|
||||||
{
|
{
|
||||||
struct rq_wb *rwb;
|
struct rq_wb *rwb;
|
||||||
@@ -707,7 +712,7 @@ int wbt_init(struct request_queue *q)
|
|||||||
if (!rwb)
|
if (!rwb)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
rwb->cb = blk_stat_alloc_callback(wb_timer_fn, blk_stat_rq_ddir, 2, rwb);
|
rwb->cb = blk_stat_alloc_callback(wb_timer_fn, wbt_data_dir, 2, rwb);
|
||||||
if (!rwb->cb) {
|
if (!rwb->cb) {
|
||||||
kfree(rwb);
|
kfree(rwb);
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|||||||
Reference in New Issue
Block a user