diff options
| -rw-r--r-- | block/blktrace.c | 11 | 
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; | |||
| 31 | /* | 31 | /* | 
| 32 | * Send out a notify message. | 32 | * Send out a notify message. | 
| 33 | */ | 33 | */ | 
| 34 | static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action, | 34 | static void trace_note(struct blk_trace *bt, pid_t pid, int action, | 
| 35 | const void *data, size_t len) | 35 | const void *data, size_t len) | 
| 36 | { | 36 | { | 
| 37 | struct blk_io_trace *t; | 37 | struct blk_io_trace *t; | 
| 38 | 38 | ||
| @@ -49,8 +49,6 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action, | |||
| 49 | t->pdu_len = len; | 49 | t->pdu_len = len; | 
| 50 | memcpy((void *) t + sizeof(*t), data, len); | 50 | memcpy((void *) t + sizeof(*t), data, len); | 
| 51 | } | 51 | } | 
| 52 | |||
| 53 | return blktrace_seq; | ||
| 54 | } | 52 | } | 
| 55 | 53 | ||
| 56 | /* | 54 | /* | 
| @@ -59,9 +57,8 @@ static unsigned int trace_note(struct blk_trace *bt, pid_t pid, int action, | |||
| 59 | */ | 57 | */ | 
| 60 | static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk) | 58 | static void trace_note_tsk(struct blk_trace *bt, struct task_struct *tsk) | 
| 61 | { | 59 | { | 
| 62 | tsk->btrace_seq = trace_note(bt, tsk->pid, | 60 | tsk->btrace_seq = blktrace_seq; | 
| 63 | BLK_TN_PROCESS, | 61 | trace_note(bt, tsk->pid, BLK_TN_PROCESS, tsk->comm, sizeof(tsk->comm)); | 
| 64 | tsk->comm, sizeof(tsk->comm)); | ||
| 65 | } | 62 | } | 
| 66 | 63 | ||
| 67 | static void trace_note_time(struct blk_trace *bt) | 64 | static void trace_note_time(struct blk_trace *bt) | 
