From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 4 Dec 2006 08:27:41 +0000 (+0100)
Subject: [PATCH] blktrace: uninline trace_note()
X-Git-Tag: v2.6.20-rc1~34^2~40^2~3^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3d9d2a5ea9770db07aeb13a07f999aa48e8f865;p=linux-2.6

[PATCH] blktrace: uninline trace_note()

It's too large to inline. Additionally clean it up, by fast pathing
the likely path.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/blktrace.c b/block/blktrace.c
index 562ca7cbf8..17bbdb811a 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -31,25 +31,25 @@ 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,
-		const void *data, size_t len)
+static unsigned int 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;
-
-	t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
-	t->time = sched_clock() - per_cpu(blk_trace_cpu_offset, cpu);
-	t->device = bt->dev;
-	t->action = action;
-	t->pid = pid;
-	t->cpu = cpu;
-	t->pdu_len = len;
-	memcpy((void *) t + sizeof(*t), data, len);
+	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);
+		t->device = bt->dev;
+		t->action = action;
+		t->pid = pid;
+		t->cpu = cpu;
+		t->pdu_len = len;
+		memcpy((void *) t + sizeof(*t), data, len);
+	}
+
 	return blktrace_seq;
 }