Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

block: remove block_unplug_timer() trace point 



We no longer have an unplug timer running, so no point in keeping
the trace point.

Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 109b8129

include/trace/events/block.h

+0 −14
Original line number Diff line number Diff line
@@ -418,20 +418,6 @@ DECLARE_EVENT_CLASS(block_unplug, 
	TP_printk("[%s] %d", __entry->comm, __entry->nr_rq)

);



/**

 * block_unplug_timer - timed release of operations requests in queue to device driver

 * @q: request queue to unplug

 *

 * Unplug the request queue @q because a timer expired and allow block

 * operation requests to be sent to the device driver.

 */

DEFINE_EVENT(block_unplug, block_unplug_timer,



	TP_PROTO(struct request_queue *q),



	TP_ARGS(q)

);



/**

 * block_unplug_io - release of operations requests in request queue

 * @q: request queue to unplug

kernel/trace/blktrace.c

+0 −17
Original line number Diff line number Diff line
@@ -863,19 +863,6 @@ static void blk_add_trace_unplug_io(void *ignore, struct request_queue *q) 
	}

}



static void blk_add_trace_unplug_timer(void *ignore, struct request_queue *q)

{

	struct blk_trace *bt = q->blk_trace;



	if (bt) {

		unsigned int pdu = q->rq.count[READ] + q->rq.count[WRITE];

		__be64 rpdu = cpu_to_be64(pdu);



		__blk_add_trace(bt, 0, 0, 0, BLK_TA_UNPLUG_TIMER, 0,

				sizeof(rpdu), &rpdu);

	}

}



static void blk_add_trace_split(void *ignore,

				struct request_queue *q, struct bio *bio,

				unsigned int pdu)
@@ -1015,8 +1002,6 @@ static void blk_register_tracepoints(void) 
	WARN_ON(ret);

	ret = register_trace_block_plug(blk_add_trace_plug, NULL);

	WARN_ON(ret);

	ret = register_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL);

	WARN_ON(ret);

	ret = register_trace_block_unplug_io(blk_add_trace_unplug_io, NULL);

	WARN_ON(ret);

	ret = register_trace_block_split(blk_add_trace_split, NULL);
@@ -1033,7 +1018,6 @@ static void blk_unregister_tracepoints(void) 
	unregister_trace_block_bio_remap(blk_add_trace_bio_remap, NULL);

	unregister_trace_block_split(blk_add_trace_split, NULL);

	unregister_trace_block_unplug_io(blk_add_trace_unplug_io, NULL);

	unregister_trace_block_unplug_timer(blk_add_trace_unplug_timer, NULL);

	unregister_trace_block_plug(blk_add_trace_plug, NULL);

	unregister_trace_block_sleeprq(blk_add_trace_sleeprq, NULL);

	unregister_trace_block_getrq(blk_add_trace_getrq, NULL);
@@ -1348,7 +1332,6 @@ static const struct { 
	[__BLK_TA_COMPLETE]	= {{  "C", "complete" },   blk_log_with_error },

	[__BLK_TA_PLUG]		= {{  "P", "plug" },	   blk_log_plug },

	[__BLK_TA_UNPLUG_IO]	= {{  "U", "unplug_io" },  blk_log_unplug },

	[__BLK_TA_UNPLUG_TIMER]	= {{ "UT", "unplug_timer" }, blk_log_unplug },

	[__BLK_TA_INSERT]	= {{  "I", "insert" },	   blk_log_generic },

	[__BLK_TA_SPLIT]	= {{  "X", "split" },	   blk_log_split },

	[__BLK_TA_BOUNCE]	= {{  "B", "bounce" },	   blk_log_generic },