From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: "Josef Bacik" <jbacik@fb.com>, "James Smart" <james.smart@broadcom.com>, "Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>, "Roger Pau Monné" <roger.pau@citrix.com>, linux-scsi@vger.kernel.org, linux-nvme@lists.infradead.org, linux-block@vger.kernel.org, dm-devel@redhat.com Subject: [PATCH 24/25] blktrace: remove the unused block_rq_abort tracepoint Date: Thu, 6 Apr 2017 17:39:43 +0200 [thread overview] Message-ID: <20170406153944.10058-25-hch@lst.de> (raw) In-Reply-To: <20170406153944.10058-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/trace/events/block.h | 44 ++++++++++---------------------------------- kernel/trace/blktrace.c | 9 --------- 2 files changed, 10 insertions(+), 43 deletions(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index a88ed13446ff..99ed69fad041 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -61,7 +61,16 @@ DEFINE_EVENT(block_buffer, block_dirty_buffer, TP_ARGS(bh) ); -DECLARE_EVENT_CLASS(block_rq_with_error, +/** + * block_rq_requeue - place block IO request back on a queue + * @q: queue holding operation + * @rq: block IO operation request + * + * The block operation request @rq is being placed back into queue + * @q. For some reason the request was not completed and needs to be + * put back in the queue. + */ +TRACE_EVENT(block_rq_requeue, TP_PROTO(struct request_queue *q, struct request *rq), @@ -94,39 +103,6 @@ DECLARE_EVENT_CLASS(block_rq_with_error, ); /** - * block_rq_abort - abort block operation request - * @q: queue containing the block operation request - * @rq: block IO operation request - * - * Called immediately after pending block IO operation request @rq in - * queue @q is aborted. The fields in the operation request @rq - * can be examined to determine which device and sectors the pending - * operation would access. - */ -DEFINE_EVENT(block_rq_with_error, block_rq_abort, - - TP_PROTO(struct request_queue *q, struct request *rq), - - TP_ARGS(q, rq) -); - -/** - * block_rq_requeue - place block IO request back on a queue - * @q: queue holding operation - * @rq: block IO operation request - * - * The block operation request @rq is being placed back into queue - * @q. For some reason the request was not completed and needs to be - * put back in the queue. - */ -DEFINE_EVENT(block_rq_with_error, block_rq_requeue, - - TP_PROTO(struct request_queue *q, struct request *rq), - - TP_ARGS(q, rq) -); - -/** * block_rq_complete - block IO operation completed by device driver * @q: queue containing the block operation request * @rq: block operations request diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index b2058a7f94bd..9f3624dadb09 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -716,12 +716,6 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq, rq->cmd_flags, what, rq->errors, 0, NULL); } -static void blk_add_trace_rq_abort(void *ignore, - struct request_queue *q, struct request *rq) -{ - blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_ABORT); -} - static void blk_add_trace_rq_insert(void *ignore, struct request_queue *q, struct request *rq) { @@ -974,8 +968,6 @@ static void blk_register_tracepoints(void) { int ret; - ret = register_trace_block_rq_abort(blk_add_trace_rq_abort, NULL); - WARN_ON(ret); ret = register_trace_block_rq_insert(blk_add_trace_rq_insert, NULL); WARN_ON(ret); ret = register_trace_block_rq_issue(blk_add_trace_rq_issue, NULL); @@ -1028,7 +1020,6 @@ static void blk_unregister_tracepoints(void) unregister_trace_block_rq_requeue(blk_add_trace_rq_requeue, NULL); unregister_trace_block_rq_issue(blk_add_trace_rq_issue, NULL); unregister_trace_block_rq_insert(blk_add_trace_rq_insert, NULL); - unregister_trace_block_rq_abort(blk_add_trace_rq_abort, NULL); tracepoint_synchronize_unregister(); } -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig) Subject: [PATCH 24/25] blktrace: remove the unused block_rq_abort tracepoint Date: Thu, 6 Apr 2017 17:39:43 +0200 [thread overview] Message-ID: <20170406153944.10058-25-hch@lst.de> (raw) In-Reply-To: <20170406153944.10058-1-hch@lst.de> Signed-off-by: Christoph Hellwig <hch at lst.de> --- include/trace/events/block.h | 44 ++++++++++---------------------------------- kernel/trace/blktrace.c | 9 --------- 2 files changed, 10 insertions(+), 43 deletions(-) diff --git a/include/trace/events/block.h b/include/trace/events/block.h index a88ed13446ff..99ed69fad041 100644 --- a/include/trace/events/block.h +++ b/include/trace/events/block.h @@ -61,7 +61,16 @@ DEFINE_EVENT(block_buffer, block_dirty_buffer, TP_ARGS(bh) ); -DECLARE_EVENT_CLASS(block_rq_with_error, +/** + * block_rq_requeue - place block IO request back on a queue + * @q: queue holding operation + * @rq: block IO operation request + * + * The block operation request @rq is being placed back into queue + * @q. For some reason the request was not completed and needs to be + * put back in the queue. + */ +TRACE_EVENT(block_rq_requeue, TP_PROTO(struct request_queue *q, struct request *rq), @@ -94,39 +103,6 @@ DECLARE_EVENT_CLASS(block_rq_with_error, ); /** - * block_rq_abort - abort block operation request - * @q: queue containing the block operation request - * @rq: block IO operation request - * - * Called immediately after pending block IO operation request @rq in - * queue @q is aborted. The fields in the operation request @rq - * can be examined to determine which device and sectors the pending - * operation would access. - */ -DEFINE_EVENT(block_rq_with_error, block_rq_abort, - - TP_PROTO(struct request_queue *q, struct request *rq), - - TP_ARGS(q, rq) -); - -/** - * block_rq_requeue - place block IO request back on a queue - * @q: queue holding operation - * @rq: block IO operation request - * - * The block operation request @rq is being placed back into queue - * @q. For some reason the request was not completed and needs to be - * put back in the queue. - */ -DEFINE_EVENT(block_rq_with_error, block_rq_requeue, - - TP_PROTO(struct request_queue *q, struct request *rq), - - TP_ARGS(q, rq) -); - -/** * block_rq_complete - block IO operation completed by device driver * @q: queue containing the block operation request * @rq: block operations request diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index b2058a7f94bd..9f3624dadb09 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -716,12 +716,6 @@ static void blk_add_trace_rq(struct request_queue *q, struct request *rq, rq->cmd_flags, what, rq->errors, 0, NULL); } -static void blk_add_trace_rq_abort(void *ignore, - struct request_queue *q, struct request *rq) -{ - blk_add_trace_rq(q, rq, blk_rq_bytes(rq), BLK_TA_ABORT); -} - static void blk_add_trace_rq_insert(void *ignore, struct request_queue *q, struct request *rq) { @@ -974,8 +968,6 @@ static void blk_register_tracepoints(void) { int ret; - ret = register_trace_block_rq_abort(blk_add_trace_rq_abort, NULL); - WARN_ON(ret); ret = register_trace_block_rq_insert(blk_add_trace_rq_insert, NULL); WARN_ON(ret); ret = register_trace_block_rq_issue(blk_add_trace_rq_issue, NULL); @@ -1028,7 +1020,6 @@ static void blk_unregister_tracepoints(void) unregister_trace_block_rq_requeue(blk_add_trace_rq_requeue, NULL); unregister_trace_block_rq_issue(blk_add_trace_rq_issue, NULL); unregister_trace_block_rq_insert(blk_add_trace_rq_insert, NULL); - unregister_trace_block_rq_abort(blk_add_trace_rq_abort, NULL); tracepoint_synchronize_unregister(); } -- 2.11.0
next prev parent reply other threads:[~2017-04-06 15:39 UTC|newest] Thread overview: 115+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-06 15:39 kill req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 01/25] remove the mg_disk driver Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-13 19:58 ` Bart Van Assche 2017-04-13 19:58 ` Bart Van Assche 2017-04-13 19:58 ` Bart Van Assche 2017-04-14 8:21 ` hch 2017-04-14 8:21 ` hch 2017-04-06 15:39 ` [PATCH 02/25] block: remove the blk_execute_rq return value Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 18:38 ` Johannes Thumshirn 2017-04-06 18:38 ` Johannes Thumshirn 2017-04-06 18:38 ` Johannes Thumshirn 2017-04-13 20:03 ` Bart Van Assche 2017-04-13 20:03 ` Bart Van Assche 2017-04-13 20:03 ` Bart Van Assche 2017-04-14 8:22 ` hch 2017-04-14 8:22 ` hch 2017-04-17 16:01 ` Jens Axboe 2017-04-17 16:01 ` Jens Axboe 2017-04-18 7:50 ` hch 2017-04-18 7:50 ` hch 2017-04-18 7:50 ` hch 2017-04-06 15:39 ` [PATCH 03/25] nvme-fc: fix status code handling in nvme_fc_fcpio_done Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 18:50 ` Johannes Thumshirn 2017-04-06 18:50 ` Johannes Thumshirn 2017-04-06 18:50 ` Johannes Thumshirn 2017-04-06 15:39 ` [PATCH 04/25] nvme: split nvme status from block req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 18:47 ` Johannes Thumshirn 2017-04-06 18:47 ` Johannes Thumshirn 2017-04-06 18:47 ` Johannes Thumshirn 2017-04-06 15:39 ` [PATCH 05/25] nvme: make nvme_error_status private Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 06/25] virtio: fix spelling of virtblk_scsi_request_done Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 18:53 ` Johannes Thumshirn 2017-04-06 18:53 ` Johannes Thumshirn 2017-04-06 18:53 ` Johannes Thumshirn 2017-04-13 20:05 ` Bart Van Assche 2017-04-13 20:05 ` Bart Van Assche 2017-04-13 20:05 ` Bart Van Assche 2017-04-06 15:39 ` [PATCH 07/25] virtio_blk: don't use req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 18:55 ` Johannes Thumshirn 2017-04-06 18:55 ` Johannes Thumshirn 2017-04-06 18:55 ` Johannes Thumshirn 2017-04-06 15:39 ` [PATCH 08/25] scsi: fix fast-fail for non-passthrough requests Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-13 20:41 ` Bart Van Assche 2017-04-13 20:41 ` Bart Van Assche 2017-04-13 20:41 ` Bart Van Assche 2017-04-06 15:39 ` [PATCH 09/25] scsi: introduce a new result field in struct scsi_request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 10/25] loop: zero-fill bio on the submitting cpu Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-12 10:24 ` Ming Lei 2017-04-12 10:24 ` Ming Lei 2017-04-06 15:39 ` [PATCH 11/25] null_blk: don't pass always-0 req->errors to blk_mq_complete_request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 12/25] dm rq: don't pass irrelevant error code " Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 13/25] dm mpath: don't check for req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 14/25] nbd: don't use req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 21:11 ` Josef Bacik 2017-04-06 21:11 ` Josef Bacik 2017-04-06 15:39 ` [PATCH 15/25] mtip32xx: add a status field to struct mtip_cmd Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 16/25] xen-blkfront: don't use req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-18 15:00 ` Roger Pau Monné 2017-04-18 15:00 ` Roger Pau Monné 2017-04-18 15:00 ` Roger Pau Monné 2017-04-18 15:05 ` Konrad Rzeszutek Wilk 2017-04-18 15:05 ` Konrad Rzeszutek Wilk 2017-04-18 15:05 ` Konrad Rzeszutek Wilk 2017-04-06 15:39 ` [PATCH 17/25] blk-mq: remove the error argument to blk_mq_complete_request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-18 15:03 ` Roger Pau Monné 2017-04-18 15:03 ` Roger Pau Monné 2017-04-18 15:03 ` Roger Pau Monné 2017-04-18 15:06 ` Konrad Rzeszutek Wilk 2017-04-18 15:06 ` Konrad Rzeszutek Wilk 2017-04-18 15:06 ` Konrad Rzeszutek Wilk 2017-04-06 15:39 ` [PATCH 18/25] blk-mq: simplify __blk_mq_complete_request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 19/25] block: add a error_count field to struct request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 20/25] floppy: switch from req->errors to req->error_count Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 21/25] ataflop: " Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 22/25] swim3: remove (commented out) printing of req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` [PATCH 23/25] pd: remove bogus check for req->errors Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig [this message] 2017-04-06 15:39 ` [PATCH 24/25] blktrace: remove the unused block_rq_abort tracepoint Christoph Hellwig 2017-04-06 15:39 ` [PATCH 25/25] block: remove the errors field from struct request Christoph Hellwig 2017-04-06 15:39 ` Christoph Hellwig 2017-04-06 20:00 ` kill req->errors Konrad Rzeszutek Wilk 2017-04-06 20:00 ` Konrad Rzeszutek Wilk 2017-04-07 7:11 ` Christoph Hellwig 2017-04-07 7:11 ` Christoph Hellwig 2017-04-18 14:33 ` Konrad Rzeszutek Wilk 2017-04-18 14:33 ` Konrad Rzeszutek Wilk 2017-04-12 8:37 ` Christoph Hellwig 2017-04-12 8:37 ` Christoph Hellwig 2017-04-12 8:38 ` Christoph Hellwig 2017-04-12 8:38 ` Christoph Hellwig 2017-04-18 0:59 ` Guan Junxiong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170406153944.10058-25-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=james.smart@broadcom.com \ --cc=jbacik@fb.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-block@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-scsi@vger.kernel.org \ --cc=roger.pau@citrix.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.