From: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
To: linux-block@vger.kernel.org, dm-devel@redhat.com
Cc: jack@suse.czi, rdunlap@infradead.org, sagi@grimberg.me,
mingo@redhat.com, rostedt@goodmis.org, snitzer@redhat.com,
agk@redhat.com, axboe@kernel.dk, paolo.valente@linaro.org,
ming.lei@redhat.com, bvanassche@acm.org, fangguoju@gmail.com,
colyli@suse.de, hch@lst.de,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH 07/11] block: get rid of blk_trace_request_get_cgid()
Date: Mon, 29 Jun 2020 16:43:10 -0700 [thread overview]
Message-ID: <20200629234314.10509-8-chaitanya.kulkarni@wdc.com> (raw)
In-Reply-To: <20200629234314.10509-1-chaitanya.kulkarni@wdc.com>
Now that we have done cleanup we can safely get rid of the
blk_trace_request_get_cgid() and replace it with
blk_trace_bio_get_cgid().
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 1d36e6153ab8..bb864a50307f 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -804,15 +804,6 @@ u64 blk_trace_bio_get_cgid(struct request_queue *q, struct bio *bio)
}
#endif
-static u64
-blk_trace_request_get_cgid(struct request_queue *q, struct request *rq)
-{
- if (!rq->bio)
- return 0;
- /* Use the first bio */
- return blk_trace_bio_get_cgid(q, rq->bio);
-}
-
/*
* blktrace probes
*/
@@ -854,32 +845,32 @@ static void blk_add_trace_rq(struct request *rq, int error,
static void blk_add_trace_rq_insert(void *ignore, struct request *rq)
{
blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_INSERT,
- blk_trace_request_get_cgid(rq->q, rq));
+ rq->bio ? blk_trace_bio_get_cgid(rq->q, rq->bio) : 0);
}
static void blk_add_trace_rq_issue(void *ignore, struct request *rq)
{
blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_ISSUE,
- blk_trace_request_get_cgid(rq->q, rq));
+ rq->bio ? blk_trace_bio_get_cgid(rq->q, rq->bio) : 0);
}
static void blk_add_trace_rq_merge(void *ignore, struct request *rq)
{
blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_BACKMERGE,
- blk_trace_request_get_cgid(rq->q, rq));
+ rq->bio ? blk_trace_bio_get_cgid(rq->q, rq->bio) : 0);
}
static void blk_add_trace_rq_requeue(void *ignore, struct request *rq)
{
blk_add_trace_rq(rq, 0, blk_rq_bytes(rq), BLK_TA_REQUEUE,
- blk_trace_request_get_cgid(rq->q, rq));
+ rq->bio ? blk_trace_bio_get_cgid(rq->q, rq->bio) : 0);
}
static void blk_add_trace_rq_complete(void *ignore, struct request *rq,
int error, unsigned int nr_bytes)
{
blk_add_trace_rq(rq, error, nr_bytes, BLK_TA_COMPLETE,
- blk_trace_request_get_cgid(rq->q, rq));
+ rq->bio ? blk_trace_bio_get_cgid(rq->q, rq->bio) : 0);
}
/**
@@ -1105,7 +1096,8 @@ static void blk_add_trace_rq_remap(void *ignore,
__blk_add_trace(bt, blk_rq_pos(rq), blk_rq_bytes(rq),
rq_data_dir(rq), 0, BLK_TA_REMAP, 0,
- sizeof(r), &r, blk_trace_request_get_cgid(q, rq));
+ sizeof(r), &r,
+ rq->bio ? blk_trace_bio_get_cgid(q, rq->bio) : 0);
rcu_read_unlock();
}
@@ -1134,8 +1126,8 @@ void blk_add_driver_data(struct request_queue *q,
}
__blk_add_trace(bt, blk_rq_trace_sector(rq), blk_rq_bytes(rq), 0, 0,
- BLK_TA_DRV_DATA, 0, len, data,
- blk_trace_request_get_cgid(q, rq));
+ BLK_TA_DRV_DATA, 0, len, data,
+ rq->bio ? blk_trace_bio_get_cgid(q, rq->bio) : 0);
rcu_read_unlock();
}
EXPORT_SYMBOL_GPL(blk_add_driver_data);
--
2.26.0
next prev parent reply other threads:[~2020-06-29 23:44 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 23:43 [PATCH 00/10] block: blktrace framework cleanup Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 01/11] " Chaitanya Kulkarni
2020-06-30 5:10 ` Christoph Hellwig
2020-07-01 4:32 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 02/11] block: rename block_bio_merge class to block_bio Chaitanya Kulkarni
2020-06-30 5:10 ` Christoph Hellwig
2020-07-01 4:33 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 03/11] block: use block_bio event class for bio_queue Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 04/11] block: use block_bio event class for bio_bounce Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 05/11] block: get rid of the trace rq insert wrapper Chaitanya Kulkarni
2020-06-30 5:11 ` Christoph Hellwig
2020-07-01 4:34 ` Chaitanya Kulkarni
2020-07-03 23:29 ` Chaitanya Kulkarni
2020-07-07 6:57 ` hch
2020-06-29 23:43 ` [PATCH 06/11] block: remove extra param for trace_block_getrq() Chaitanya Kulkarni
2020-06-29 23:43 ` Chaitanya Kulkarni [this message]
2020-06-30 5:12 ` [PATCH 07/11] block: get rid of blk_trace_request_get_cgid() Christoph Hellwig
2020-07-01 4:38 ` Chaitanya Kulkarni
2020-07-01 6:16 ` Christoph Hellwig
2020-07-01 21:06 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 08/11] block: fix the comments in the trace event block.h Chaitanya Kulkarni
2020-06-30 5:12 ` Christoph Hellwig
2020-06-29 23:43 ` [PATCH 09/11] block: remove unsed param in blk_fill_rwbs() Chaitanya Kulkarni
2020-06-30 5:12 ` Christoph Hellwig
2020-07-01 4:38 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 10/11] block: use block_bio class for getrq and sleeprq Chaitanya Kulkarni
2020-06-30 5:13 ` Christoph Hellwig
2020-07-01 4:45 ` Chaitanya Kulkarni
2020-07-01 6:18 ` Christoph Hellwig
2020-07-01 21:06 ` Chaitanya Kulkarni
2020-06-29 23:43 ` [PATCH 11/11] block: remove block_get_rq event class Chaitanya Kulkarni
2020-06-30 0:58 ` [PATCH 00/10] block: blktrace framework cleanup Steven Rostedt
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=20200629234314.10509-8-chaitanya.kulkarni@wdc.com \
--to=chaitanya.kulkarni@wdc.com \
--cc=agk@redhat.com \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=fangguoju@gmail.com \
--cc=hch@lst.de \
--cc=jack@suse.czi \
--cc=linux-block@vger.kernel.org \
--cc=ming.lei@redhat.com \
--cc=mingo@redhat.com \
--cc=paolo.valente@linaro.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sagi@grimberg.me \
--cc=snitzer@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).