Commit a54895fa authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove the request_queue to argument request based tracepoints 



The request_queue can trivially be derived from the request.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1c02fca6

block/blk-merge.c

+1 −1
Original line number Diff line number Diff line
@@ -799,7 +799,7 @@ static struct request *attempt_merge(struct request_queue *q, 
	 */

	blk_account_io_merge_request(next);



	trace_block_rq_merge(q, next);

	trace_block_rq_merge(next);



	/*

	 * ownership of bio passed from next to req, return 'next' for

block/blk-mq-sched.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ EXPORT_SYMBOL_GPL(blk_mq_sched_try_insert_merge); 


void blk_mq_sched_request_inserted(struct request *rq)

{

	trace_block_rq_insert(rq->q, rq);

	trace_block_rq_insert(rq);

}

EXPORT_SYMBOL_GPL(blk_mq_sched_request_inserted);

block/blk-mq.c

+4 −4
Original line number Diff line number Diff line
@@ -733,7 +733,7 @@ void blk_mq_start_request(struct request *rq) 
{

	struct request_queue *q = rq->q;



	trace_block_rq_issue(q, rq);

	trace_block_rq_issue(rq);



	if (test_bit(QUEUE_FLAG_STATS, &q->queue_flags)) {

		rq->io_start_time_ns = ktime_get_ns();
@@ -760,7 +760,7 @@ static void __blk_mq_requeue_request(struct request *rq) 


	blk_mq_put_driver_tag(rq);



	trace_block_rq_requeue(q, rq);

	trace_block_rq_requeue(rq);

	rq_qos_requeue(q, rq);



	if (blk_mq_request_started(rq)) {
@@ -1821,7 +1821,7 @@ static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx, 


	lockdep_assert_held(&ctx->lock);



	trace_block_rq_insert(hctx->queue, rq);

	trace_block_rq_insert(rq);



	if (at_head)

		list_add(&rq->queuelist, &ctx->rq_lists[type]);
@@ -1878,7 +1878,7 @@ void blk_mq_insert_requests(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, 
	 */

	list_for_each_entry(rq, list, queuelist) {

		BUG_ON(rq->mq_ctx != ctx);

		trace_block_rq_insert(hctx->queue, rq);

		trace_block_rq_insert(rq);

	}



	spin_lock(&ctx->lock);

drivers/md/dm-rq.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int map_request(struct dm_rq_target_io *tio) 
		}



		/* The target has remapped the I/O so dispatch it */

		trace_block_rq_remap(clone->q, clone, disk_devt(dm_disk(md)),

		trace_block_rq_remap(clone, disk_devt(dm_disk(md)),

				     blk_rq_pos(rq));

		ret = dm_dispatch_clone_request(clone, rq);

		if (ret == BLK_STS_RESOURCE || ret == BLK_STS_DEV_RESOURCE) {

drivers/s390/scsi/zfcp_fsf.c

+1 −2
Original line number Diff line number Diff line
@@ -2359,8 +2359,7 @@ static void zfcp_fsf_req_trace(struct zfcp_fsf_req *req, struct scsi_cmnd *scsi) 
		}

	}



	blk_add_driver_data(scsi->request->q, scsi->request, &blktrc,

			    sizeof(blktrc));

	blk_add_driver_data(scsi->request, &blktrc, sizeof(blktrc));

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE