From bf4df00ff8c3132c594416cd588441c7ba4fc9c4 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 1 Sep 2005 17:25:00 +0200 Subject: [PATCH] [PATCH] Move BLK_TA_QUEUE trace It makes more sense to do it after request allocation. --- CHANGELOG | 1 + ...trace-2.6.13-mm1-B1 => blk-trace-2.6.13-mm1-B2} | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) rename kernel/{blk-trace-2.6.13-mm1-B1 => blk-trace-2.6.13-mm1-B2} (98%) diff --git a/CHANGELOG b/CHANGELOG index 4680ae2..1a89416 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ - Converted to comply with time stamps comparable on each CPU - Fix oops on tracing dm/md and other stacked devices - Always make sure we stop the trace properly + - Move BLK_TA_QUEUE trace 20050830: - Added argument parsing - Added action mask set up diff --git a/kernel/blk-trace-2.6.13-mm1-B1 b/kernel/blk-trace-2.6.13-mm1-B2 similarity index 98% rename from kernel/blk-trace-2.6.13-mm1-B1 rename to kernel/blk-trace-2.6.13-mm1-B2 index 0a40a23..4c90947 100644 --- a/kernel/blk-trace-2.6.13-mm1-B1 +++ b/kernel/blk-trace-2.6.13-mm1-B2 @@ -234,7 +234,7 @@ diff -urpN -X linux-2.6.13-mm1/Documentation/dontdiff /opt/kernel/linux-2.6.13-m depends on !UML diff -urpN -X linux-2.6.13-mm1/Documentation/dontdiff /opt/kernel/linux-2.6.13-mm1/drivers/block/ll_rw_blk.c linux-2.6.13-mm1/drivers/block/ll_rw_blk.c --- /opt/kernel/linux-2.6.13-mm1/drivers/block/ll_rw_blk.c 2005-09-01 13:07:30.000000000 +0200 -+++ linux-2.6.13-mm1/drivers/block/ll_rw_blk.c 2005-09-01 13:08:42.000000000 +0200 ++++ linux-2.6.13-mm1/drivers/block/ll_rw_blk.c 2005-09-01 17:22:46.000000000 +0200 @@ -29,6 +29,7 @@ #include #include @@ -301,15 +301,15 @@ diff -urpN -X linux-2.6.13-mm1/Documentation/dontdiff /opt/kernel/linux-2.6.13-m bio->bi_next = req->bio; req->bio = bio; -@@ -2705,6 +2722,8 @@ static int __make_request(request_queue_ - } +@@ -2745,6 +2762,8 @@ get_rq: + req->rq_disk = bio->bi_bdev->bd_disk; + req->start_time = jiffies; - get_rq: + blk_add_trace_bio(q, bio, BLK_TA_QUEUE); + - /* - * Grab a free request. This is might sleep but can not fail. - * Returns with the queue unlocked. + spin_lock_irq(q->queue_lock); + if (elv_queue_empty(q)) + blk_plug_device(q); @@ -2981,6 +3000,10 @@ end_io: blk_partition_remap(bio); -- 2.25.1