Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3ff8a2f authored by Hugh Dickins's avatar Hugh Dickins Committed by Tejun Heo
Browse files

cgroup: remove stray references to css_id 



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

Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8173d5a4

drivers/md/bcache/request.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

include/linux/cgroup.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

mm/page_cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{