summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugh Dickins <hughd@google.com>2014-01-12 20:23:27 -0800
committerTejun Heo <tj@kernel.org>2014-01-13 10:48:18 -0500
commitb3ff8a2f9569fb41b9cf8902897d787a33bac84f (patch)
tree28c95f2ee2eba0a4ea516c89eb82339243a75d89
parent8173d5a495b5f859d56d8581d0e2ce5c1fab9c33 (diff)
downloadop-kernel-dev-b3ff8a2f9569fb41b9cf8902897d787a33bac84f.zip
op-kernel-dev-b3ff8a2f9569fb41b9cf8902897d787a33bac84f.tar.gz
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>
-rw-r--r--drivers/md/bcache/request.c1
-rw-r--r--include/linux/cgroup.h3
-rw-r--r--mm/page_cgroup.c2
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index fbcc851..61bcfc2 100644
--- 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 cfaf416..5c09759 100644
--- 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 6d757e3a..3bd0b8e 100644
--- 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)
{
OpenPOWER on IntegriCloud