diff options
author | Jianyu Zhan <nasa4836@gmail.com> | 2014-04-25 18:28:03 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-04-25 18:28:03 -0400 |
commit | a2a1f9eaf945c46b5b2bc0e439cba68888e3d540 (patch) | |
tree | 62964130b8dfb56e60ecf44be6e961419e332843 /kernel/cgroup.c | |
parent | f8719ccf7bc0858384c7e93d8c57fe69ae8c9eac (diff) |
cgroup: replace pr_warning with preferred pr_warn
As suggested by scripts/checkpatch.pl, substitude all pr_warning()
with pr_warn().
No functional change.
Signed-off-by: Jianyu Zhan <nasa4836@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 3849d3d2dfe1..cb453e9954c1 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c | |||
@@ -1126,9 +1126,9 @@ static int rebind_subsystems(struct cgroup_root *dst_root, | |||
1126 | * Just warn about it and continue. | 1126 | * Just warn about it and continue. |
1127 | */ | 1127 | */ |
1128 | if (cgrp_dfl_root_visible) { | 1128 | if (cgrp_dfl_root_visible) { |
1129 | pr_warning("cgroup: failed to create files (%d) while rebinding 0x%lx to default root\n", | 1129 | pr_warn("cgroup: failed to create files (%d) while rebinding 0x%lx to default root\n", |
1130 | ret, ss_mask); | 1130 | ret, ss_mask); |
1131 | pr_warning("cgroup: you may retry by moving them to a different hierarchy and unbinding\n"); | 1131 | pr_warn("cgroup: you may retry by moving them to a different hierarchy and unbinding\n"); |
1132 | } | 1132 | } |
1133 | } | 1133 | } |
1134 | 1134 | ||
@@ -1323,7 +1323,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) | |||
1323 | /* Consistency checks */ | 1323 | /* Consistency checks */ |
1324 | 1324 | ||
1325 | if (opts->flags & CGRP_ROOT_SANE_BEHAVIOR) { | 1325 | if (opts->flags & CGRP_ROOT_SANE_BEHAVIOR) { |
1326 | pr_warning("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n"); | 1326 | pr_warn("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n"); |
1327 | 1327 | ||
1328 | if ((opts->flags & (CGRP_ROOT_NOPREFIX | CGRP_ROOT_XATTR)) || | 1328 | if ((opts->flags & (CGRP_ROOT_NOPREFIX | CGRP_ROOT_XATTR)) || |
1329 | opts->cpuset_clone_children || opts->release_agent || | 1329 | opts->cpuset_clone_children || opts->release_agent || |
@@ -1387,8 +1387,8 @@ static int cgroup_remount(struct kernfs_root *kf_root, int *flags, char *data) | |||
1387 | goto out_unlock; | 1387 | goto out_unlock; |
1388 | 1388 | ||
1389 | if (opts.subsys_mask != root->subsys_mask || opts.release_agent) | 1389 | if (opts.subsys_mask != root->subsys_mask || opts.release_agent) |
1390 | pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n", | 1390 | pr_warn("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n", |
1391 | task_tgid_nr(current), current->comm); | 1391 | task_tgid_nr(current), current->comm); |
1392 | 1392 | ||
1393 | added_mask = opts.subsys_mask & ~root->subsys_mask; | 1393 | added_mask = opts.subsys_mask & ~root->subsys_mask; |
1394 | removed_mask = root->subsys_mask & ~opts.subsys_mask; | 1394 | removed_mask = root->subsys_mask & ~opts.subsys_mask; |
@@ -1669,7 +1669,7 @@ retry: | |||
1669 | ret = -EINVAL; | 1669 | ret = -EINVAL; |
1670 | goto out_unlock; | 1670 | goto out_unlock; |
1671 | } else { | 1671 | } else { |
1672 | pr_warning("cgroup: new mount options do not match the existing superblock, will be ignored\n"); | 1672 | pr_warn("cgroup: new mount options do not match the existing superblock, will be ignored\n"); |
1673 | } | 1673 | } |
1674 | } | 1674 | } |
1675 | 1675 | ||
@@ -4168,10 +4168,10 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss) | |||
4168 | 4168 | ||
4169 | if (ss->broken_hierarchy && !ss->warned_broken_hierarchy && | 4169 | if (ss->broken_hierarchy && !ss->warned_broken_hierarchy && |
4170 | parent->parent) { | 4170 | parent->parent) { |
4171 | pr_warning("cgroup: %s (%d) created nested cgroup for controller \"%s\" which has incomplete hierarchy support. Nested cgroups may change behavior in the future.\n", | 4171 | pr_warn("cgroup: %s (%d) created nested cgroup for controller \"%s\" which has incomplete hierarchy support. Nested cgroups may change behavior in the future.\n", |
4172 | current->comm, current->pid, ss->name); | 4172 | current->comm, current->pid, ss->name); |
4173 | if (!strcmp(ss->name, "memory")) | 4173 | if (!strcmp(ss->name, "memory")) |
4174 | pr_warning("cgroup: \"memory\" requires setting use_hierarchy to 1 on the root.\n"); | 4174 | pr_warn("cgroup: \"memory\" requires setting use_hierarchy to 1 on the root.\n"); |
4175 | ss->warned_broken_hierarchy = true; | 4175 | ss->warned_broken_hierarchy = true; |
4176 | } | 4176 | } |
4177 | 4177 | ||