task IO accounting: move all IO statistics in struct task_io_accounting

[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 165390f..5e88afc 100644 (file)
--- a/include/linux/task_io_accounting.h
+++ b/include/linux/task_io_accounting.h
@@ -1,5 +1,5 @@
 /*
- * proc_io_accounting: a structure which is used for recording a single task's
+ * task_io_accounting: a structure which is used for recording a single task's
  * IO statistics.
  *
  * Don't include this header file directly - it is designed to be dragged in via
@@ -8,8 +8,8 @@
  * Blame akpm@osdl.org for all this.
  */
 
+struct task_io_accounting {
 #ifdef CONFIG_TASK_XACCT
-struct task_chr_io_accounting {
        /* bytes read */
        u64 rchar;
        /*  bytes written */
@@ -18,14 +18,9 @@ struct task_chr_io_accounting {
        u64 syscr;
        /* # of write syscalls */
        u64 syscw;
-};
-#else /* CONFIG_TASK_XACCT */
-struct task_chr_io_accounting {
-};
 #endif /* CONFIG_TASK_XACCT */
 
 #ifdef CONFIG_TASK_IO_ACCOUNTING
-struct task_io_accounting {
        /*
         * The number of bytes which this task has caused to be read from
         * storage.
@@ -46,13 +41,5 @@ struct task_io_accounting {
         * information loss in doing that.
         */
        u64 cancelled_write_bytes;
-};
-#else /* CONFIG_TASK_IO_ACCOUNTING */
-struct task_io_accounting {
-};
 #endif /* CONFIG_TASK_IO_ACCOUNTING */
-
-struct proc_io_accounting {
-       struct task_chr_io_accounting chr;
-       struct task_io_accounting blk;
 };