CGroup API files: rename read/write_uint methods to read_write_u64

[deliverable/linux.git] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 028ba3b523b1b8a3a8cdeea0ad745552ae84a8cd..058371c5d360d9f56fae1131187a20a4b0b13e60 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -190,20 +190,20 @@ struct cftype {
                         struct file *file,
                         char __user *buf, size_t nbytes, loff_t *ppos);
        /*
-        * read_uint() is a shortcut for the common case of returning a
+        * read_u64() is a shortcut for the common case of returning a
         * single integer. Use it in place of read()
         */
-       u64 (*read_uint) (struct cgroup *cgrp, struct cftype *cft);
+       u64 (*read_u64) (struct cgroup *cgrp, struct cftype *cft);
        ssize_t (*write) (struct cgroup *cgrp, struct cftype *cft,
                          struct file *file,
                          const char __user *buf, size_t nbytes, loff_t *ppos);
 
        /*
-        * write_uint() is a shortcut for the common case of accepting
+        * write_u64() is a shortcut for the common case of accepting
         * a single integer (as parsed by simple_strtoull) from
         * userspace. Use in place of write(); return 0 or error.
         */
-       int (*write_uint) (struct cgroup *cgrp, struct cftype *cft, u64 val);
+       int (*write_u64) (struct cgroup *cgrp, struct cftype *cft, u64 val);
 
        int (*release) (struct inode *inode, struct file *file);
 };
@@ -256,6 +256,7 @@ struct cgroup_subsys {
        void (*bind)(struct cgroup_subsys *ss, struct cgroup *root);
        int subsys_id;
        int active;
+       int disabled;
        int early_init;
 #define MAX_CGROUP_TYPE_NAMELEN 32
        const char *name;