diff options
author | Tejun Heo <tj@kernel.org> | 2016-12-27 14:49:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-12-27 14:49:08 -0500 |
commit | d62beb7f3dc6b45f9b9d381897e05fe8ba286d8a (patch) | |
tree | 597146abe4cdcb0024b578d735da1da15ae4bf6d /kernel/cgroup/cgroup-v1.c | |
parent | 1592c9b223749d59b933ebbfe37f1a8833d7a6cf (diff) |
cgroup: rename functions for consistency
Now that v1 functions are separated out, rename some functions for
consistency.
cgroup_dfl_base_files -> cgroup_base_files
cgroup_legacy_base_files -> cgroup1_base_files
cgroup_ssid_no_v1() -> cgroup1_ssid_disabled()
cgroup_pidlist_destroy_all -> cgroup1_pidlist_destroy_all()
cgroup_release_agent() -> cgroup1_release_agent()
check_for_release() -> cgroup1_check_for_release()
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Acked-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'kernel/cgroup/cgroup-v1.c')
-rw-r--r-- | kernel/cgroup/cgroup-v1.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index ae240c0d33cb..37be09e09740 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c | |||
@@ -36,7 +36,7 @@ static struct workqueue_struct *cgroup_pidlist_destroy_wq; | |||
36 | */ | 36 | */ |
37 | static DEFINE_SPINLOCK(release_agent_path_lock); | 37 | static DEFINE_SPINLOCK(release_agent_path_lock); |
38 | 38 | ||
39 | bool cgroup_ssid_no_v1(int ssid) | 39 | bool cgroup1_ssid_disabled(int ssid) |
40 | { | 40 | { |
41 | return cgroup_no_v1_mask & (1 << ssid); | 41 | return cgroup_no_v1_mask & (1 << ssid); |
42 | } | 42 | } |
@@ -201,7 +201,7 @@ static void pidlist_free(void *p) | |||
201 | * Used to destroy all pidlists lingering waiting for destroy timer. None | 201 | * Used to destroy all pidlists lingering waiting for destroy timer. None |
202 | * should be left afterwards. | 202 | * should be left afterwards. |
203 | */ | 203 | */ |
204 | void cgroup_pidlist_destroy_all(struct cgroup *cgrp) | 204 | void cgroup1_pidlist_destroy_all(struct cgroup *cgrp) |
205 | { | 205 | { |
206 | struct cgroup_pidlist *l, *tmp_l; | 206 | struct cgroup_pidlist *l, *tmp_l; |
207 | 207 | ||
@@ -585,7 +585,7 @@ static int cgroup_clone_children_write(struct cgroup_subsys_state *css, | |||
585 | } | 585 | } |
586 | 586 | ||
587 | /* cgroup core interface files for the legacy hierarchies */ | 587 | /* cgroup core interface files for the legacy hierarchies */ |
588 | struct cftype cgroup_legacy_base_files[] = { | 588 | struct cftype cgroup1_base_files[] = { |
589 | { | 589 | { |
590 | .name = "cgroup.procs", | 590 | .name = "cgroup.procs", |
591 | .seq_start = cgroup_pidlist_start, | 591 | .seq_start = cgroup_pidlist_start, |
@@ -729,7 +729,7 @@ int cgroupstats_build(struct cgroupstats *stats, struct dentry *dentry) | |||
729 | return 0; | 729 | return 0; |
730 | } | 730 | } |
731 | 731 | ||
732 | void check_for_release(struct cgroup *cgrp) | 732 | void cgroup1_check_for_release(struct cgroup *cgrp) |
733 | { | 733 | { |
734 | if (notify_on_release(cgrp) && !cgroup_is_populated(cgrp) && | 734 | if (notify_on_release(cgrp) && !cgroup_is_populated(cgrp) && |
735 | !css_has_online_children(&cgrp->self) && !cgroup_is_dead(cgrp)) | 735 | !css_has_online_children(&cgrp->self) && !cgroup_is_dead(cgrp)) |
@@ -759,7 +759,7 @@ void check_for_release(struct cgroup *cgrp) | |||
759 | * this routine has no use for the exit status of the release agent | 759 | * this routine has no use for the exit status of the release agent |
760 | * task, so no sense holding our caller up for that. | 760 | * task, so no sense holding our caller up for that. |
761 | */ | 761 | */ |
762 | void cgroup_release_agent(struct work_struct *work) | 762 | void cgroup1_release_agent(struct work_struct *work) |
763 | { | 763 | { |
764 | struct cgroup *cgrp = | 764 | struct cgroup *cgrp = |
765 | container_of(work, struct cgroup, release_agent_work); | 765 | container_of(work, struct cgroup, release_agent_work); |
@@ -946,7 +946,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) | |||
946 | continue; | 946 | continue; |
947 | if (!cgroup_ssid_enabled(i)) | 947 | if (!cgroup_ssid_enabled(i)) |
948 | continue; | 948 | continue; |
949 | if (cgroup_ssid_no_v1(i)) | 949 | if (cgroup1_ssid_disabled(i)) |
950 | continue; | 950 | continue; |
951 | 951 | ||
952 | /* Mutually exclusive option 'all' + subsystem name */ | 952 | /* Mutually exclusive option 'all' + subsystem name */ |
@@ -968,7 +968,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) | |||
968 | */ | 968 | */ |
969 | if (all_ss || (!one_ss && !opts->none && !opts->name)) | 969 | if (all_ss || (!one_ss && !opts->none && !opts->name)) |
970 | for_each_subsys(ss, i) | 970 | for_each_subsys(ss, i) |
971 | if (cgroup_ssid_enabled(i) && !cgroup_ssid_no_v1(i)) | 971 | if (cgroup_ssid_enabled(i) && !cgroup1_ssid_disabled(i)) |
972 | opts->subsys_mask |= (1 << i); | 972 | opts->subsys_mask |= (1 << i); |
973 | 973 | ||
974 | /* | 974 | /* |