Commit 2d941e99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block 

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] blktrace: don't return blktrace_seq from trace_note()
  [PATCH] blktrace: uninline trace_note()
parents 651857a1 a863055b

block/blktrace.c

+16 −19
Original line number Diff line number Diff line
@@ -31,16 +31,14 @@ static unsigned int blktrace_seq __read_mostly = 1; 
/*

 * Send out a notify message.

 */

static inline unsigned int trace_note(struct blk_trace *bt,

		pid_t pid, int action,

static void trace_note(struct blk_trace *bt, pid_t pid, int action,

		       const void *data, size_t len)

{

	struct blk_io_trace *t;

	int cpu = smp_processor_id();



	t = relay_reserve(bt->rchan, sizeof(*t) + len);

	if (t == NULL)

		return 0;

	if (t) {

		const int cpu = smp_processor_id();



		t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;

		t->time = sched_clock() - per_cpu(blk_trace_cpu_offset, cpu);
@@ -50,7 +48,7 @@ static inline unsigned int trace_note(struct blk_trace *bt, 
		t->cpu = cpu;

		t->pdu_len = len;

		memcpy((void *) t + sizeof(*t), data, len);

	return blktrace_seq;

	}

}



/*
@@ -59,9 +57,8 @@ static inline unsigned int trace_note(struct blk_trace *bt, 
 */

static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk)

{

	tsk->btrace_seq = trace_note(bt, tsk->pid,

			BLK_TN_PROCESS,

			tsk->comm, sizeof(tsk->comm));

	tsk->btrace_seq = blktrace_seq;

	trace_note(bt, tsk->pid, BLK_TN_PROCESS, tsk->comm, sizeof(tsk->comm));

}



static void trace_note_time(struct blk_trace *bt)