adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] ifdef blktrace debugging fields

Browse source 
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>
This commit is contained in:
Alexey Dobriyan 2006-09-29 01:59:40 -07:00 committed by Linus Torvalds
parent 3d5b6fccc4
commit 6c5c934153
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
block/blktrace.c
View file

@ -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) void blk_trace_shutdown(request_queue_t *q)
{ {
blk_trace_startstop(q, 0); if (q->blk_trace) {
blk_trace_remove(q); blk_trace_startstop(q, 0);
blk_trace_remove(q);
}
} }
/* /*

3
block/ll_rw_blk.c
View file

@ -1847,8 +1847,7 @@ static void blk_release_queue(struct kobject *kobj)
if (q->queue_tags) if (q->queue_tags)
__blk_queue_free_tags(q); __blk_queue_free_tags(q);
if (q->blk_trace) blk_trace_shutdown(q);
blk_trace_shutdown(q);
kmem_cache_free(requestq_cachep, q); kmem_cache_free(requestq_cachep, q);
} }

4
include/linux/blkdev.h
View file

@ -417,9 +417,9 @@ struct request_queue
unsigned int sg_timeout; unsigned int sg_timeout;
unsigned int sg_reserved_size; unsigned int sg_reserved_size;
int node; int node;
#ifdef CONFIG_BLK_DEV_IO_TRACE
struct blk_trace *blk_trace; struct blk_trace *blk_trace;
#endif
/* /*
* reserved for flush operations * reserved for flush operations
*/ */

3
include/linux/sched.h
View file

@ -784,8 +784,9 @@ struct task_struct {
struct prio_array *array; struct prio_array *array;
unsigned short ioprio; unsigned short ioprio;
#ifdef CONFIG_BLK_DEV_IO_TRACE
unsigned int btrace_seq; unsigned int btrace_seq;
#endif
unsigned long sleep_avg; unsigned long sleep_avg;
unsigned long long timestamp, last_ran; unsigned long long timestamp, last_ran;
unsigned long long sched_time; /* sched_clock time spent running */ unsigned long long sched_time; /* sched_clock time spent running */

2
kernel/fork.c
View file

@ -183,7 +183,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
/* One for us, one for whoever does the "release_task()" (usually parent) */ /* One for us, one for whoever does the "release_task()" (usually parent) */
atomic_set(&tsk->usage,2); atomic_set(&tsk->usage,2);
atomic_set(&tsk->fs_excl, 0); atomic_set(&tsk->fs_excl, 0);
#ifdef CONFIG_BLK_DEV_IO_TRACE
tsk->btrace_seq = 0; tsk->btrace_seq = 0;
#endif
tsk->splice_pipe = NULL; tsk->splice_pipe = NULL;
return tsk; return tsk;
} }