block: remove 'req->part' check for stats accounting

If RQF_IO_STAT is set, then accounting is enabled. There's no need to
further gate this on req->part being set or not, RQF_IO_STAT should
never be set if accounting is not being done for this request.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 6a339942948ae33115b395ce9493b0854131a19b..c7220ed0392e198efe10fa0ae2e207a547c30b60 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -92,7 +92,7 @@ static bool blk_mq_check_inflight(struct request *rq, void *priv)
 {
        struct mq_inflight *mi = priv;
 
-       if (rq->part && blk_do_io_stat(rq) &&
+       if (blk_do_io_stat(rq) &&
            (!bdev_is_partition(mi->part) || rq->part == mi->part) &&
            blk_mq_rq_state(rq) == MQ_RQ_IN_FLIGHT)
                mi->inflight[rq_data_dir(rq)]++;
@@ -762,7 +762,7 @@ EXPORT_SYMBOL(blk_dump_rq_flags);
 
 static void blk_account_io_completion(struct request *req, unsigned int bytes)
 {
-       if (req->part && blk_do_io_stat(req)) {
+       if (blk_do_io_stat(req)) {
                const int sgrp = op_stat_group(req_op(req));
 
                part_stat_lock();
@@ -980,8 +980,7 @@ static inline void blk_account_io_done(struct request *req, u64 now)
         * normal IO on queueing nor completion.  Accounting the
         * containing request is enough.
         */
-       if (blk_do_io_stat(req) && req->part &&
-           !(req->rq_flags & RQF_FLUSH_SEQ)) {
+       if (blk_do_io_stat(req) && !(req->rq_flags & RQF_FLUSH_SEQ)) {
                const int sgrp = op_stat_group(req_op(req));
 
                part_stat_lock();