Commit fd0a63bc authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2c50ec98

block/blk-mq.c

+3 −4
Original line number Diff line number Diff line
@@ -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();