cgroup: Use more current logging style (ed3d261b) · Commits · 戴 / test

kernel/cgroup.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@
		* distribution for more details.
		*/

		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/cgroup.h>
		#include <linux/cred.h>
		#include <linux/ctype.h>
		@@ -1126,9 +1128,9 @@ static int rebind_subsystems(struct cgroup_root *dst_root,
		* Just warn about it and continue.
		*/
		if (cgrp_dfl_root_visible) {
		pr_warn("cgroup: failed to create files (%d) while rebinding 0x%lx to default root\n",
		pr_warn("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");
		pr_warn("you may retry by moving them to a different hierarchy and unbinding\n");
		}
		}

		@@ -1323,12 +1325,12 @@ static int parse_cgroupfs_options(char data, struct cgroup_sb_opts opts)
		/* Consistency checks */

		if (opts->flags & CGRP_ROOT_SANE_BEHAVIOR) {
		pr_warn("cgroup: sane_behavior: this is still under development and its behaviors will change, proceed at your own risk\n");
		pr_warn("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 \|\|
		opts->name) {
		pr_err("cgroup: sane_behavior: noprefix, xattr, clone_children, release_agent and name are not allowed\n");
		pr_err("sane_behavior: noprefix, xattr, clone_children, release_agent and name are not allowed\n");
		return -EINVAL;
		}
		} else {
		@@ -1374,7 +1376,7 @@ static int cgroup_remount(struct kernfs_root kf_root, int flags, char *data)
		unsigned long added_mask, removed_mask;

		if (root->flags & CGRP_ROOT_SANE_BEHAVIOR) {
		pr_err("cgroup: sane_behavior: remount is not allowed\n");
		pr_err("sane_behavior: remount is not allowed\n");
		return -EINVAL;
		}

		@@ -1387,7 +1389,7 @@ 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_warn("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
		pr_warn("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;
		@@ -1396,7 +1398,7 @@ static int cgroup_remount(struct kernfs_root kf_root, int flags, char *data)
		/* Don't allow flags or name to change at remount */
		if (((opts.flags ^ root->flags) & CGRP_ROOT_OPTION_MASK) \|\|
		(opts.name && strcmp(opts.name, root->name))) {
		pr_err("cgroup: option or name mismatch, new: 0x%lx \"%s\", old: 0x%lx \"%s\"\n",
		pr_err("option or name mismatch, new: 0x%lx \"%s\", old: 0x%lx \"%s\"\n",
		opts.flags & CGRP_ROOT_OPTION_MASK, opts.name ?: "",
		root->flags & CGRP_ROOT_OPTION_MASK, root->name);
		ret = -EINVAL;
		@@ -1665,11 +1667,11 @@ retry:

		if ((root->flags ^ opts.flags) & CGRP_ROOT_OPTION_MASK) {
		if ((root->flags \| opts.flags) & CGRP_ROOT_SANE_BEHAVIOR) {
		pr_err("cgroup: sane_behavior: new mount options should match the existing superblock\n");
		pr_err("sane_behavior: new mount options should match the existing superblock\n");
		ret = -EINVAL;
		goto out_unlock;
		} else {
		pr_warn("cgroup: new mount options do not match the existing superblock, will be ignored\n");
		pr_warn("new mount options do not match the existing superblock, will be ignored\n");
		}
		}

		@@ -2889,8 +2891,8 @@ static int cgroup_addrm_files(struct cgroup *cgrp, struct cftype cfts[],
		if (is_add) {
		ret = cgroup_add_file(cgrp, cft);
		if (ret) {
		pr_warn("cgroup_addrm_files: failed to add %s, err=%d\n",
		cft->name, ret);
		pr_warn("%s: failed to add %s, err=%d\n",
		__func__, cft->name, ret);
		return ret;
		}
		} else {
		@@ -4168,10 +4170,10 @@ static int create_css(struct cgroup cgrp, struct cgroup_subsys ss)

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

Admin message