[PATCH] blktrace: don't return blktrace_seq from trace_note()
Only the process notifier needs it, and it can set it manually.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/block/blktrace.c b/block/blktrace.c
index 17bbdb8..74e02c0 100644
--- a/block/blktrace.c
+++ b/block/blktrace.c
@@ -31,8 +31,8 @@
/*
* 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 @@
t->pdu_len = len;
memcpy((void *) t + sizeof(*t), data, len);
}
-
- return blktrace_seq;
}
/*
@@ -59,9 +57,8 @@
*/
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)