git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tracing: add same level recursion detection
[safe/jmp/linux-2.6]
/
include
/
linux
/
task_io_accounting.h
diff --git
a/include/linux/task_io_accounting.h
b/include/linux/task_io_accounting.h
index
44d00e9
..
bdf855c
100644
(file)
--- a/
include/linux/task_io_accounting.h
+++ b/
include/linux/task_io_accounting.h
@@
-5,11
+5,22
@@
* Don't include this header file directly - it is designed to be dragged in via
* sched.h.
*
* Don't include this header file directly - it is designed to be dragged in via
* sched.h.
*
- * Blame
akpm@osdl.org
for all this.
+ * Blame
Andrew Morton
for all this.
*/
*/
-#ifdef CONFIG_TASK_IO_ACCOUNTING
struct task_io_accounting {
struct task_io_accounting {
+#ifdef CONFIG_TASK_XACCT
+ /* bytes read */
+ u64 rchar;
+ /* bytes written */
+ u64 wchar;
+ /* # of read syscalls */
+ u64 syscr;
+ /* # of write syscalls */
+ u64 syscw;
+#endif /* CONFIG_TASK_XACCT */
+
+#ifdef CONFIG_TASK_IO_ACCOUNTING
/*
* The number of bytes which this task has caused to be read from
* storage.
/*
* The number of bytes which this task has caused to be read from
* storage.
@@
-30,8
+41,5
@@
struct task_io_accounting {
* information loss in doing that.
*/
u64 cancelled_write_bytes;
* information loss in doing that.
*/
u64 cancelled_write_bytes;
+#endif /* CONFIG_TASK_IO_ACCOUNTING */
};
};
-#else
-struct task_io_accounting {
-};
-#endif