Skip to content

Commit

Permalink
cgroup: replace pr_warning with preferred pr_warn
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
JianyuZhan authored and htejun committed Apr 25, 2014
1 parent f8719cc commit a2a1f9e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions kernel/cgroup.c
Original file line number Diff line number Diff line change
Expand Up @@ -1126,9 +1126,9 @@ static int rebind_subsystems(struct cgroup_root *dst_root,
* Just warn about it and continue.
*/
if (cgrp_dfl_root_visible) {
pr_warning("cgroup: failed to create files (%d) while rebinding 0x%lx to default root\n",
ret, ss_mask);
pr_warning("cgroup: you may retry by moving them to a different hierarchy and unbinding\n");
pr_warn("cgroup: failed to create files (%d) while rebinding 0x%lx to default root\n",
ret, ss_mask);
pr_warn("cgroup: you may retry by moving them to a different hierarchy and unbinding\n");
}
}

Expand Down Expand Up @@ -1323,7 +1323,7 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts)
/* Consistency checks */

if (opts->flags & CGRP_ROOT_SANE_BEHAVIOR) {
pr_warning("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n");
pr_warn("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n");

if ((opts->flags & (CGRP_ROOT_NOPREFIX | CGRP_ROOT_XATTR)) ||
opts->cpuset_clone_children || opts->release_agent ||
Expand Down Expand Up @@ -1387,8 +1387,8 @@ static int cgroup_remount(struct kernfs_root *kf_root, int *flags, char *data)
goto out_unlock;

if (opts.subsys_mask != root->subsys_mask || opts.release_agent)
pr_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
task_tgid_nr(current), current->comm);
pr_warn("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
task_tgid_nr(current), current->comm);

added_mask = opts.subsys_mask & ~root->subsys_mask;
removed_mask = root->subsys_mask & ~opts.subsys_mask;
Expand Down Expand Up @@ -1669,7 +1669,7 @@ static struct dentry *cgroup_mount(struct file_system_type *fs_type,
ret = -EINVAL;
goto out_unlock;
} else {
pr_warning("cgroup: new mount options do not match the existing superblock, will be ignored\n");
pr_warn("cgroup: new mount options do not match the existing superblock, will be ignored\n");
}
}

Expand Down Expand Up @@ -4168,10 +4168,10 @@ static int create_css(struct cgroup *cgrp, struct cgroup_subsys *ss)

if (ss->broken_hierarchy && !ss->warned_broken_hierarchy &&
parent->parent) {
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",
current->comm, current->pid, ss->name);
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",
current->comm, current->pid, ss->name);
if (!strcmp(ss->name, "memory"))
pr_warning("cgroup: \"memory\" requires setting use_hierarchy to 1 on the root.\n");
pr_warn("cgroup: \"memory\" requires setting use_hierarchy to 1 on the root.\n");
ss->warned_broken_hierarchy = true;
}

Expand Down

0 comments on commit a2a1f9e

Please sign in to comment.