Browse Source

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>
Hugh Dickins 11 years ago
parent
commit
b3ff8a2f95
3 changed files with 1 additions and 5 deletions
  1. 0 1
      drivers/md/bcache/request.c
  2. 0 3
      include/linux/cgroup.h
  3. 1 1
      mm/page_cgroup.c

+ 0 - 1
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)
 static void bcachecg_destroy(struct cgroup *cgroup)
 {
 {
 	struct bch_cgroup *cg = cgroup_to_bcache(cgroup);
 	struct bch_cgroup *cg = cgroup_to_bcache(cgroup);
-	free_css_id(&bcache_subsys, &cg->css);
 	kfree(cg);
 	kfree(cg);
 }
 }
 
 

+ 0 - 3
include/linux/cgroup.h

@@ -29,7 +29,6 @@ struct cgroupfs_root;
 struct cgroup_subsys;
 struct cgroup_subsys;
 struct inode;
 struct inode;
 struct cgroup;
 struct cgroup;
-struct css_id;
 
 
 extern int cgroup_init_early(void);
 extern int cgroup_init_early(void);
 extern int cgroup_init(void);
 extern int cgroup_init(void);
@@ -79,8 +78,6 @@ struct cgroup_subsys_state {
 	struct cgroup_subsys_state *parent;
 	struct cgroup_subsys_state *parent;
 
 
 	unsigned long flags;
 	unsigned long flags;
-	/* ID for this css, if possible */
-	struct css_id __rcu *id;
 
 
 	/* percpu_ref killing and RCU release */
 	/* percpu_ref killing and RCU release */
 	struct rcu_head rcu_head;
 	struct rcu_head rcu_head;

+ 1 - 1
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
  * lookup_swap_cgroup_id - lookup mem_cgroup id tied to swap entry
  * @ent: swap entry to be looked up.
  * @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)
 unsigned short lookup_swap_cgroup_id(swp_entry_t ent)
 {
 {