cgroup: convert cgroup_ida to cgroup_idr

[~andy/linux] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index fd097ecfcd9747849365a0590f91c64f0f7a4479..cca570e188fb4add2afd1ab8b9e376825137c6a9 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -161,7 +161,7 @@ struct cgroup_name {
 struct cgroup {
        unsigned long flags;            /* "unsigned long" so bitops work */
 
-       int id;                         /* ida allocated in-hierarchy ID */
+       int id;                         /* idr allocated in-hierarchy ID */
 
        /*
         * We link our 'sibling' struct into our parent's 'children'.
@@ -278,6 +278,8 @@ enum {
         *
         * - memcg: use_hierarchy is on by default and the cgroup file for
         *   the flag is not created.
+        *
+        * - blkcg: blk-throttle becomes properly hierarchical.
         */
        CGRP_ROOT_SANE_BEHAVIOR = (1 << 0),
 
@@ -320,7 +322,7 @@ struct cgroupfs_root {
        unsigned long flags;
 
        /* IDs for cgroups in this hierarchy */
-       struct ida cgroup_ida;
+       struct idr cgroup_idr;
 
        /* The path to use for release notifications. */
        char release_agent_path[PATH_MAX];
@@ -392,8 +394,8 @@ struct cgroup_map_cb {
 
 /* cftype->flags */
 enum {
-       CFTYPE_ONLY_ON_ROOT     = (1 << 0),     /* only create on root cg */
-       CFTYPE_NOT_ON_ROOT      = (1 << 1),     /* don't create on root cg */
+       CFTYPE_ONLY_ON_ROOT     = (1 << 0),     /* only create on root cgrp */
+       CFTYPE_NOT_ON_ROOT      = (1 << 1),     /* don't create on root cgrp */
        CFTYPE_INSANE           = (1 << 2),     /* don't create if sane_behavior */
 };
 
@@ -511,7 +513,7 @@ struct cftype_set {
 };
 
 struct cgroup_scanner {
-       struct cgroup *cg;
+       struct cgroup *cgrp;
        int (*test_task)(struct task_struct *p, struct cgroup_scanner *scan);
        void (*process_task)(struct task_struct *p,
                        struct cgroup_scanner *scan);