summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2006-09-29 01:59:40 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 09:18:09 -0700
commit6c5c934153513dc72e2d6464f39e8ef1f27c0a3e (patch)
treebe799da4af646a96c2d6ab473e276a7361beb685 /block
parent3d5b6fccc4b900cc4267692f015ea500bad4c6bf (diff)
downloadblackbird-op-linux-6c5c934153513dc72e2d6464f39e8ef1f27c0a3e.tar.gz
blackbird-op-linux-6c5c934153513dc72e2d6464f39e8ef1f27c0a3e.zip
[PATCH] ifdef blktrace debugging fields
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block')
-rw-r--r--block/blktrace.c6
-rw-r--r--block/ll_rw_blk.c3
2 files changed, 5 insertions, 4 deletions
diff --git a/block/blktrace.c b/block/blktrace.c
index 2b4ef2b89b8d..8ff33441d8a2 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -450,8 +450,10 @@ int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
**/
void blk_trace_shutdown(request_queue_t *q)
{
- blk_trace_startstop(q, 0);
- blk_trace_remove(q);
+ if (q->blk_trace) {
+ blk_trace_startstop(q, 0);
+ blk_trace_remove(q);
+ }
}
/*
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 9c3a06bcb7ba..51dc0edf76e0 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1847,8 +1847,7 @@ static void blk_release_queue(struct kobject *kobj)
if (q->queue_tags)
__blk_queue_free_tags(q);
- if (q->blk_trace)
- blk_trace_shutdown(q);
+ blk_trace_shutdown(q);
kmem_cache_free(requestq_cachep, q);
}
OpenPOWER on IntegriCloud