cgroup: replace pr_warning with preferred pr_warn (a2a1f9ea) · Commits · 戴 / test

kernel/cgroup.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -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",
		pr_warn("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: you may retry by moving them to a different hierarchy and unbinding\n");
		}
		}

		@@ -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 \|\|
		@@ -1387,7 +1387,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_warning("cgroup: option changes via remount are deprecated (pid=%d comm=%s)\n",
		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;
		@@ -1669,7 +1669,7 @@ retry:
		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");
		}
		}

		@@ -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",
		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;
		}

Admin message