Merge tag 'f2fs-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs

[linux.git] / include / linux / cgroup-defs.h

diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
index 430e219e3abafdf9ac308888b4e86b67108ec621..63097cb243cb3b803785b9328e65e7aa7b2897d0 100644 (file)
--- a/include/linux/cgroup-defs.h
+++ b/include/linux/cgroup-defs.h
@@ -354,16 +354,6 @@ struct cgroup {
 
        unsigned long flags;            /* "unsigned long" so bitops work */
 
-       /*
-        * idr allocated in-hierarchy ID.
-        *
-        * ID 0 is not used, the ID of the root cgroup is always 1, and a
-        * new cgroup will be assigned with a smallest available ID.
-        *
-        * Allocating/Removing ID must be protected by cgroup_mutex.
-        */
-       int id;
-
        /*
         * The depth this cgroup is at.  The root is at depth zero and each
         * step down the hierarchy increments the level.  This along with
@@ -458,7 +448,7 @@ struct cgroup {
        struct list_head rstat_css_list;
 
        /* cgroup basic resource statistics */
-       struct cgroup_base_stat pending_bstat;  /* pending from children */
+       struct cgroup_base_stat last_bstat;
        struct cgroup_base_stat bstat;
        struct prev_cputime prev_cputime;       /* for printing out cputime */
 
@@ -488,7 +478,7 @@ struct cgroup {
        struct cgroup_freezer_state freezer;
 
        /* ids of the ancestors at each level including self */
-       int ancestor_ids[];
+       u64 ancestor_ids[];
 };
 
 /*
@@ -509,7 +499,7 @@ struct cgroup_root {
        struct cgroup cgrp;
 
        /* for cgrp->ancestor_ids[0] */
-       int cgrp_ancestor_id_storage;
+       u64 cgrp_ancestor_id_storage;
 
        /* Number of cgroups in the hierarchy, used only for /proc/cgroups */
        atomic_t nr_cgrps;
@@ -520,9 +510,6 @@ struct cgroup_root {
        /* Hierarchy-specific flags */
        unsigned int flags;
 
-       /* IDs for cgroups in this hierarchy */
-       struct idr cgroup_idr;
-
        /* The path to use for release notifications. */
        char release_agent_path[PATH_MAX];