Commit b357e4a6 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe
Browse files

block: get rid of the trace rq insert wrapper 



Get rid of the wrapper for trace_block_rq_insert() and call the function
directly.

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent b0719245

block/bfq-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 
#include <linux/delay.h>

#include <linux/backing-dev.h>



#include <trace/events/block.h>



#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-tag.h"
@@ -5621,7 +5623,7 @@ static void bfq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq, 


	spin_unlock_irq(&bfqd->lock);



	blk_mq_sched_request_inserted(rq);

	trace_block_rq_insert(rq);



	spin_lock_irq(&bfqd->lock);

	bfqq = bfq_init_rq(rq);

block/blk-core.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_remap); 
EXPORT_TRACEPOINT_SYMBOL_GPL(block_bio_complete);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_split);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_unplug);

EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_insert);



DEFINE_IDA(blk_queue_ida);

block/blk-mq-sched.c

+0 −6
Original line number Diff line number Diff line
@@ -384,12 +384,6 @@ bool blk_mq_sched_try_insert_merge(struct request_queue *q, struct request *rq) 
}

EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge);



void blk_mq_sched_request_inserted(struct request *rq)

{

	trace_block_rq_insert(rq);

}

EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);



static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,

				       bool has_sched,

				       struct request *rq)

block/blk-mq-sched.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


void blk_mq_sched_assign_ioc(struct request *rq);



void blk_mq_sched_request_inserted(struct request *rq);

bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,

		unsigned int nr_segs, struct request **merged_request);

bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio,

block/kyber-iosched.c

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#include <linux/module.h>

#include <linux/sbitmap.h>



#include <trace/events/block.h>



#include "blk.h"

#include "blk-mq.h"

#include "blk-mq-debugfs.h"
@@ -602,7 +604,7 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx, 
			list_move_tail(&rq->queuelist, head);

		sbitmap_set_bit(&khd->kcq_map[sched_domain],

				rq->mq_ctx->index_hw[hctx->type]);

		blk_mq_sched_request_inserted(rq);

		trace_block_rq_insert(rq);

		spin_unlock(&kcq->lock);

	}

}