apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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()
This commit is contained in:
Linus Torvalds
2006-12-04 19:38:30 -08:00
parent 651857a1ec a863055b10
commit 2d941e99df
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/blktrace.c
+6 -9
View File
@@ -31,16 +31,14 @@ static unsigned int blktrace_seq __read_mostly = 1;
/* /*
* Send out a notify message. * Send out a notify message.
*/ */
static inline unsigned int trace_note(struct blk_trace *bt, static void trace_note(struct blk_trace *bt, pid_t pid, int action,
pid_t pid, int action,
const void *data, size_t len) const void *data, size_t len)
{ {
struct blk_io_trace *t; struct blk_io_trace *t;
int cpu = smp_processor_id();
t = relay_reserve(bt->rchan, sizeof(*t) + len); t = relay_reserve(bt->rchan, sizeof(*t) + len);
if (t == NULL) if (t) {
return 0; const int cpu = smp_processor_id();
t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION; t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
t->time = sched_clock() - per_cpu(blk_trace_cpu_offset, cpu); 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->cpu = cpu;
t->pdu_len = len; t->pdu_len = len;
memcpy((void *) t + sizeof(*t), data, 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) static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk)
{ {
tsk->btrace_seq = trace_note(bt, tsk->pid, tsk->btrace_seq = blktrace_seq;
BLK_TN_PROCESS, trace_note(bt, tsk->pid, BLK_TN_PROCESS, tsk->comm, sizeof(tsk->comm));
tsk->comm, sizeof(tsk->comm));
} }
static void trace_note_time(struct blk_trace *bt) static void trace_note_time(struct blk_trace *bt)