Skip to content

Commit

Permalink
cgroup: remove stray references to css_id
Browse files Browse the repository at this point in the history
Trivial: remove the few stray references to css_id, which itself
was removed in v3.13's 2ff2a7d "cgroup: kill css_id".

Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Hugh Dickins authored and Tejun Heo committed Jan 13, 2014
1 parent 8173d5a commit b3ff8a2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
1 change: 0 additions & 1 deletion drivers/md/bcache/request.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
3 changes: 0 additions & 3 deletions include/linux/cgroup.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mm/page_cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit b3ff8a2

Please sign in to comment.