summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2006-12-04 09:30:58 +0100
committerJens Axboe <jens.axboe@oracle.com>2006-12-04 09:30:58 +0100
commita863055b1066be1b8e1107f71be01daeed6bde31 (patch)
treee866da31478375c6acfa8c63fda2d8ac961a6da4 /block
parentd3d9d2a5ea9770db07aeb13a07f999aa48e8f865 (diff)
downloadlinux-a863055b1066be1b8e1107f71be01daeed6bde31.tar.gz
linux-a863055b1066be1b8e1107f71be01daeed6bde31.tar.bz2
linux-a863055b1066be1b8e1107f71be01daeed6bde31.zip
[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>
Diffstat (limited to 'block')
-rw-r--r--block/blktrace.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/block/blktrace.c b/block/blktrace.c
index 17bbdb811aa7..74e02c04b2da 100644
--- a/block/blktrace.c
+++ b/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)