redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Jens Axboe 2017-04-21 07:55:42 -06:00
parent 1cc1f17aab
commit 99c749a4c4
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/blk-mq.c
View File

@ -46,7 +46,7 @@ static int blk_mq_poll_stats_bkt(const struct request *rq)
{
int ddir, bytes, bucket;
ddir = blk_stat_rq_ddir(rq);
ddir = rq_data_dir(rq);
bytes = blk_rq_bytes(rq);
bucket = ddir + 2*(ilog2(bytes) - 9);

6
block/blk-stat.c
View File

@ -19,12 +19,6 @@ struct blk_queue_stats {
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)
{
stat->min = -1ULL;

11
block/blk-stat.h
View File

@ -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 */
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.
* @timer_fn: Timer callback function.

7
block/blk-wbt.c
View File

@ -696,6 +696,11 @@ u64 wbt_default_latency_nsec(struct request_queue *q)
return 75000000ULL;
}
static int wbt_data_dir(const struct request *rq)
{
return rq_data_dir(rq);
}
int wbt_init(struct request_queue *q)
{
struct rq_wb *rwb;
@ -707,7 +712,7 @@ int wbt_init(struct request_queue *q)
if (!rwb)
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) {
kfree(rwb);
return -ENOMEM;