diff options
author | Andrea Righi <righi.andrea@gmail.com> | 2008-07-27 18:48:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 19:12:28 -0400 |
commit | 940389b8afad6495211614c13eb91ef7001773ec (patch) | |
tree | 92c581cc9dc7a067899a6a28e382e4099dfe8ead /kernel | |
parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) |
task IO accounting: move all IO statistics in struct task_io_accounting
Simplify the code of include/linux/task_io_accounting.h.
It is also more reasonable to have all the task i/o-related statistics in a
single struct (task_io_accounting).
Signed-off-by: Andrea Righi <righi.andrea@gmail.com>
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/tsacct.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/tsacct.c b/kernel/tsacct.c index f9cd2561689c..8ebcd8532dfb 100644 --- a/kernel/tsacct.c +++ b/kernel/tsacct.c | |||
@@ -94,14 +94,14 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p) | |||
94 | stats->hiwater_vm = mm->hiwater_vm * PAGE_SIZE / KB; | 94 | stats->hiwater_vm = mm->hiwater_vm * PAGE_SIZE / KB; |
95 | mmput(mm); | 95 | mmput(mm); |
96 | } | 96 | } |
97 | stats->read_char = p->ioac.chr.rchar; | 97 | stats->read_char = p->ioac.rchar; |
98 | stats->write_char = p->ioac.chr.wchar; | 98 | stats->write_char = p->ioac.wchar; |
99 | stats->read_syscalls = p->ioac.chr.syscr; | 99 | stats->read_syscalls = p->ioac.syscr; |
100 | stats->write_syscalls = p->ioac.chr.syscw; | 100 | stats->write_syscalls = p->ioac.syscw; |
101 | #ifdef CONFIG_TASK_IO_ACCOUNTING | 101 | #ifdef CONFIG_TASK_IO_ACCOUNTING |
102 | stats->read_bytes = p->ioac.blk.read_bytes; | 102 | stats->read_bytes = p->ioac.read_bytes; |
103 | stats->write_bytes = p->ioac.blk.write_bytes; | 103 | stats->write_bytes = p->ioac.write_bytes; |
104 | stats->cancelled_write_bytes = p->ioac.blk.cancelled_write_bytes; | 104 | stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes; |
105 | #else | 105 | #else |
106 | stats->read_bytes = 0; | 106 | stats->read_bytes = 0; |
107 | stats->write_bytes = 0; | 107 | stats->write_bytes = 0; |