forked from luck/tmp_suning_uos_patched
[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>
This commit is contained in:
parent
3d5b6fccc4
commit
6c5c934153
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -417,9 +417,9 @@ struct request_queue
|
|||
unsigned int sg_timeout;
|
||||
unsigned int sg_reserved_size;
|
||||
int node;
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_IO_TRACE
|
||||
struct blk_trace *blk_trace;
|
||||
|
||||
#endif
|
||||
/*
|
||||
* reserved for flush operations
|
||||
*/
|
||||
|
|
|
@ -784,8 +784,9 @@ struct task_struct {
|
|||
struct prio_array *array;
|
||||
|
||||
unsigned short ioprio;
|
||||
#ifdef CONFIG_BLK_DEV_IO_TRACE
|
||||
unsigned int btrace_seq;
|
||||
|
||||
#endif
|
||||
unsigned long sleep_avg;
|
||||
unsigned long long timestamp, last_ran;
|
||||
unsigned long long sched_time; /* sched_clock time spent running */
|
||||
|
|
|
@ -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) */
|
||||
atomic_set(&tsk->usage,2);
|
||||
atomic_set(&tsk->fs_excl, 0);
|
||||
#ifdef CONFIG_BLK_DEV_IO_TRACE
|
||||
tsk->btrace_seq = 0;
|
||||
#endif
|
||||
tsk->splice_pipe = NULL;
|
||||
return tsk;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user