---

yaml --- r: 42397 b: refs/heads/master c: a863055 h: refs/heads/master i: 42395: 575854f v: v3
git-mirror · Dec 4, 2006 · 02d619b · 02d619b
1 parent 76036e3
commit 02d619b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3d9d2a5ea9770db07aeb13a07f999aa48e8f865
+refs/heads/master: a863055b1066be1b8e1107f71be01daeed6bde31
diff --git a/trunk/block/blktrace.c b/trunk/block/blktrace.c
@@ -31,8 +31,8 @@ static unsigned int blktrace_seq __read_mostly = 1;
 /*
  * Send out a notify message.
  */
-static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action,
-			       const void *data, size_t len)
+static void trace_note(struct blk_trace *bt, pid_t pid, int action,
+		       const void *data, size_t len)
 {
 	struct blk_io_trace *t;
 
@@ -49,8 +49,6 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action,
 		t->pdu_len = len;
 		memcpy((void *) t + sizeof(*t), data, len);
 	}
-
-	return blktrace_seq;
 }
 
 /*
@@ -59,9 +57,8 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action,
  */
 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)