diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-10-03 07:29:49 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-10-22 08:14:56 -0600 |
| commit | e3569ecae44daa6d88ac1bb0c6b976c298eff966 (patch) | |
| tree | 6b9e517da02a549dd9fd5ce66d3fa31c2cafedf2 /block/blk-merge.c | |
| parent | fd0a63bcda40c09463f31b9401dbb0cb01c51674 (diff) | |
block: kill blk_do_io_stat() helper
It's now just checking whether or not RQF_IO_STAT is set, so let's get
rid of it and just open-code the specific flag that is being checked.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index ad763ec313b6..8b9a9646aed8 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -797,7 +797,7 @@ static inline void blk_update_mixed_merge(struct request *req, static void blk_account_io_merge_request(struct request *req) { - if (blk_do_io_stat(req)) { + if (req->rq_flags & RQF_IO_STAT) { part_stat_lock(); part_stat_inc(req->part, merges[op_stat_group(req_op(req))]); part_stat_local_dec(req->part, @@ -1005,12 +1005,11 @@ enum elv_merge blk_try_merge(struct request *rq, struct bio *bio) static void blk_account_io_merge_bio(struct request *req) { - if (!blk_do_io_stat(req)) - return; - - part_stat_lock(); - part_stat_inc(req->part, merges[op_stat_group(req_op(req))]); - part_stat_unlock(); + if (req->rq_flags & RQF_IO_STAT) { + part_stat_lock(); + part_stat_inc(req->part, merges[op_stat_group(req_op(req))]); + part_stat_unlock(); + } } enum bio_merge_status bio_attempt_back_merge(struct request *req, |