Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c5c9341 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] ifdef blktrace debugging fields 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3d5b6fcc

block/blktrace.c

+4 −2
Original line number Diff line number Diff line
@@ -450,9 +450,11 @@ int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg) 
 **/

void blk_trace_shutdown(request_queue_t *q)

{

	if (q->blk_trace) {

		blk_trace_startstop(q, 0);

		blk_trace_remove(q);

	}

}



/*

 * Average offset over two calls to sched_clock() with a gettimeofday()

block/ll_rw_blk.c

+1 −2
Original line number Diff line number Diff line
@@ -1847,7 +1847,6 @@ 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);



	kmem_cache_free(requestq_cachep, q);

include/linux/blkdev.h

+2 −2
Original line number Diff line number Diff line
@@ -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

	 */

include/linux/sched.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */

kernel/fork.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}