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

Commit 8af01f56 authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: s/cgroup_subsys_state/cgroup_css/ s/task_subsys_state/task_css/ 



The names of the two struct cgroup_subsys_state accessors -
cgroup_subsys_state() and task_subsys_state() - are somewhat awkward.
The former clashes with the type name and the latter doesn't even
indicate it's somehow related to cgroup.

We're about to revamp large portion of cgroup API, so, let's rename
them so that they're less awkward.  Most per-controller usages of the
accessors are localized in accessor wrappers and given the amount of
scheduled changes, this isn't gonna add any noticeable headache.

Rename cgroup_subsys_state() to cgroup_css() and task_subsys_state()
to task_css().  This patch is pure rename.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
parent 61584e3f

block/blk-cgroup.h

+2 −3
Original line number Diff line number Diff line
@@ -181,14 +181,13 @@ void blkg_conf_finish(struct blkg_conf_ctx *ctx); 


static inline struct blkcg *cgroup_to_blkcg(struct cgroup *cgroup)

{

	return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id),

	return container_of(cgroup_css(cgroup, blkio_subsys_id),

			    struct blkcg, css);

}



static inline struct blkcg *task_blkcg(struct task_struct *tsk)

{

	return container_of(task_subsys_state(tsk, blkio_subsys_id),

			    struct blkcg, css);

	return container_of(task_css(tsk, blkio_subsys_id), struct blkcg, css);

}



static inline struct blkcg *bio_blkcg(struct bio *bio)

fs/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -1946,7 +1946,7 @@ int bio_associate_current(struct bio *bio) 


	/* associate blkcg if exists */

	rcu_read_lock();

	css = task_subsys_state(current, blkio_subsys_id);

	css = task_css(current, blkio_subsys_id);

	if (css && css_tryget(css))

		bio->bi_css = css;

	rcu_read_unlock();

include/linux/cgroup.h

+19 −12
Original line number Diff line number Diff line
@@ -647,8 +647,15 @@ struct cgroup_subsys { 
#undef IS_SUBSYS_ENABLED

#undef SUBSYS



static inline struct cgroup_subsys_state *cgroup_subsys_state(

	struct cgroup *cgrp, int subsys_id)

/**

 * cgroup_css - obtain a cgroup's css for the specified subsystem

 * @cgrp: the cgroup of interest

 * @subsys_id: the subsystem of interest

 *

 * Return @cgrp's css (cgroup_subsys_state) associated with @subsys_id.

 */

static inline struct cgroup_subsys_state *cgroup_css(struct cgroup *cgrp,

						     int subsys_id)

{

	return cgrp->subsys[subsys_id];

}
@@ -678,7 +685,7 @@ extern struct mutex cgroup_mutex; 
#endif



/**

 * task_subsys_state_check - obtain css for (task, subsys) w/ extra access conds

 * task_css_check - obtain css for (task, subsys) w/ extra access conds

 * @task: the target task

 * @subsys_id: the target subsystem ID

 * @__c: extra condition expression to be passed to rcu_dereference_check()
@@ -686,7 +693,7 @@ extern struct mutex cgroup_mutex; 
 * Return the cgroup_subsys_state for the (@task, @subsys_id) pair.  The

 * synchronization rules are the same as task_css_set_check().

 */

#define task_subsys_state_check(task, subsys_id, __c)			\

#define task_css_check(task, subsys_id, __c)				\

	task_css_set_check((task), (__c))->subsys[(subsys_id)]



/**
@@ -701,22 +708,22 @@ static inline struct css_set *task_css_set(struct task_struct *task) 
}



/**

 * task_subsys_state - obtain css for (task, subsys)

 * task_css - obtain css for (task, subsys)

 * @task: the target task

 * @subsys_id: the target subsystem ID

 *

 * See task_subsys_state_check().

 * See task_css_check().

 */

static inline struct cgroup_subsys_state *

task_subsys_state(struct task_struct *task, int subsys_id)

static inline struct cgroup_subsys_state *task_css(struct task_struct *task,

						   int subsys_id)

{

	return task_subsys_state_check(task, subsys_id, false);

	return task_css_check(task, subsys_id, false);

}



static inline struct cgroup *task_cgroup(struct task_struct *task,

					 int subsys_id)

{

	return task_subsys_state(task, subsys_id)->cgroup;

	return task_css(task, subsys_id)->cgroup;

}



/**

include/net/cls_cgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline u32 task_cls_classid(struct task_struct *p) 
		return 0;



	rcu_read_lock();

	classid = container_of(task_subsys_state(p, net_cls_subsys_id),

	classid = container_of(task_css(p, net_cls_subsys_id),

			       struct cgroup_cls_state, css)->classid;

	rcu_read_unlock();
@@ -51,7 +51,7 @@ static inline u32 task_cls_classid(struct task_struct *p) 
		return 0;



	rcu_read_lock();

	css = task_subsys_state(p, net_cls_subsys_id);

	css = task_css(p, net_cls_subsys_id);

	if (css)

		classid = container_of(css,

				       struct cgroup_cls_state, css)->classid;

include/net/netprio_cgroup.h

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static inline u32 task_netprioidx(struct task_struct *p) 
	u32 idx;



	rcu_read_lock();

	css = task_subsys_state(p, net_prio_subsys_id);

	css = task_css(p, net_prio_subsys_id);

	idx = css->cgroup->id;

	rcu_read_unlock();

	return idx;
@@ -53,7 +53,7 @@ static inline u32 task_netprioidx(struct task_struct *p) 
	u32 idx = 0;



	rcu_read_lock();

	css = task_subsys_state(p, net_prio_subsys_id);

	css = task_css(p, net_prio_subsys_id);

	if (css)

		idx = css->cgroup->id;

	rcu_read_unlock();