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

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

block/blk-merge.c

+6 −7
Original line number Diff line number Diff line
@@ -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,13 +1005,12 @@ 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;



	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,

		struct bio *bio, unsigned int nr_segs)

block/blk-mq.c

+3 −3
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 (blk_do_io_stat(rq) &&

	if (rq->rq_flags & RQF_IO_STAT &&

	    (!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 (blk_do_io_stat(req)) {

	if (req->rq_flags & RQF_IO_STAT) {

		const int sgrp = op_stat_group(req_op(req));



		part_stat_lock();
@@ -980,7 +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->rq_flags & RQF_FLUSH_SEQ)) {

	if ((req->rq_flags & (RQF_IO_STAT|RQF_FLUSH_SEQ)) == RQF_IO_STAT) {

		const int sgrp = op_stat_group(req_op(req));



		part_stat_lock();

block/blk.h

+0 −11
Original line number Diff line number Diff line
@@ -405,17 +405,6 @@ void blk_apply_bdi_limits(struct backing_dev_info *bdi, 
		struct queue_limits *lim);

int blk_dev_init(void);



/*

 * Contribute to IO statistics IFF:

 *

 *	a) it's attached to a gendisk, and

 *	b) the queue had IO stats enabled when this request was started

 */

static inline bool blk_do_io_stat(struct request *rq)

{

	return rq->rq_flags & RQF_IO_STAT;

}



void update_io_ticks(struct block_device *part, unsigned long now, bool end);

unsigned int part_in_flight(struct block_device *part);