* [RFC PATCH 18/38] blktrace: update blk_add_trace_bio_frontmerge()
@ 2019-08-19 4:40 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2019-08-19 4:40 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index 342209658b22..96d4452d922d 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1236,7 +1236,14 @@ static void blk_add_trace_bio_frontmerge(void *ignore,
struct request *rq,
struct bio *bio)
{
- blk_add_trace_bio(q, bio, BLK_TA_FRONTMERGE, 0);
+ u64 ta = 0;
+
+ if (q->blk_trace) {
+ ta = BLK_TA_FRONTMERGE;
+ } else if (q->blk_trace_ext) {
+ ta = BLK_TA_FRONTMERGE_EXT;
+ }
+ blk_add_trace_bio(q, bio, ta, 0);
}
static void blk_add_trace_bio_queue(void *ignore,
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [RFC PATCH 18/38] blktrace: update blk_add_trace_bio_frontmerge()
@ 2019-07-17 21:24 Chaitanya Kulkarni
0 siblings, 0 replies; 2+ messages in thread
From: Chaitanya Kulkarni @ 2019-07-17 21:24 UTC (permalink / raw)
To: linux-btrace
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
---
kernel/trace/blktrace.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index c2233e47e0b4..b64536e2b736 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1240,7 +1240,14 @@ static void blk_add_trace_bio_frontmerge(void *ignore,
struct request *rq,
struct bio *bio)
{
- blk_add_trace_bio(q, bio, BLK_TA_FRONTMERGE, 0);
+ u64 ta = 0;
+
+ if (q->blk_trace) {
+ ta = BLK_TA_FRONTMERGE;
+ } else if (q->blk_trace_ext) {
+ ta = BLK_TA_FRONTMERGE_EXT;
+ }
+ blk_add_trace_bio(q, bio, ta, 0);
}
static void blk_add_trace_bio_queue(void *ignore,
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-19 4:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-19 4:40 [RFC PATCH 18/38] blktrace: update blk_add_trace_bio_frontmerge() Chaitanya Kulkarni
-- strict thread matches above, loose matches on Subject: below --
2019-07-17 21:24 Chaitanya Kulkarni
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).