cgroup: remove stray references to css_id

Trivial: remove the few stray references to css_id, which itself
was removed in v3.13's 2ff2a7d03bbe "cgroup: kill css_id".

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index fbcc851ed5a5a74b09d763c455d132dee68e7eb3..61bcfc21d2a0f4972b581a689fd1c3c929f7bd38 100644 (file)
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -163,7 +163,6 @@ static struct cgroup_subsys_state *bcachecg_create(struct cgroup *cgroup)
 static void bcachecg_destroy(struct cgroup *cgroup)
 {
        struct bch_cgroup *cg = cgroup_to_bcache(cgroup);
-       free_css_id(&bcache_subsys, &cg->css);
        kfree(cg);
 }
 

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index cfaf416492dd69fd6a1ecaf857d6218a7a6e0201..5c097596104b80535a0a00bdd45b4a2441fac889 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -29,7 +29,6 @@ struct cgroupfs_root;
 struct cgroup_subsys;
 struct inode;
 struct cgroup;
-struct css_id;
 
 extern int cgroup_init_early(void);
 extern int cgroup_init(void);
@@ -79,8 +78,6 @@ struct cgroup_subsys_state {
        struct cgroup_subsys_state *parent;
 
        unsigned long flags;
-       /* ID for this css, if possible */
-       struct css_id __rcu *id;
 
        /* percpu_ref killing and RCU release */
        struct rcu_head rcu_head;

diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 6d757e3a872ad52adea55aabecee1ec571c3970d..3bd0b8e6ab12f43fc3f99efb44c8998a510fd2cb 100644 (file)
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -451,7 +451,7 @@ unsigned short swap_cgroup_record(swp_entry_t ent, unsigned short id)
  * lookup_swap_cgroup_id - lookup mem_cgroup id tied to swap entry
  * @ent: swap entry to be looked up.
  *
- * Returns CSS ID of mem_cgroup at success. 0 at failure. (0 is invalid ID)
+ * Returns ID of mem_cgroup at success. 0 at failure. (0 is invalid ID)
  */
 unsigned short lookup_swap_cgroup_id(swp_entry_t ent)
 {