Commit 58c025f0 authored by Al Viro's avatar Al Viro

cgroup1: switch to use of errorfc() et.al.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bf45f7fc
...@@ -917,7 +917,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) ...@@ -917,7 +917,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
ctx->subsys_mask |= (1 << i); ctx->subsys_mask |= (1 << i);
return 0; return 0;
} }
return invalf(fc, "cgroup1: Unknown subsys name '%s'", param->key); return invalfc(fc, "Unknown subsys name '%s'", param->key);
} }
if (opt < 0) if (opt < 0)
return opt; return opt;
...@@ -945,7 +945,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) ...@@ -945,7 +945,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
case Opt_release_agent: case Opt_release_agent:
/* Specifying two release agents is forbidden */ /* Specifying two release agents is forbidden */
if (ctx->release_agent) if (ctx->release_agent)
return invalf(fc, "cgroup1: release_agent respecified"); return invalfc(fc, "release_agent respecified");
ctx->release_agent = param->string; ctx->release_agent = param->string;
param->string = NULL; param->string = NULL;
break; break;
...@@ -955,9 +955,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) ...@@ -955,9 +955,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
return -ENOENT; return -ENOENT;
/* Can't specify an empty name */ /* Can't specify an empty name */
if (!param->size) if (!param->size)
return invalf(fc, "cgroup1: Empty name"); return invalfc(fc, "Empty name");
if (param->size > MAX_CGROUP_ROOT_NAMELEN - 1) if (param->size > MAX_CGROUP_ROOT_NAMELEN - 1)
return invalf(fc, "cgroup1: Name too long"); return invalfc(fc, "Name too long");
/* Must match [\w.-]+ */ /* Must match [\w.-]+ */
for (i = 0; i < param->size; i++) { for (i = 0; i < param->size; i++) {
char c = param->string[i]; char c = param->string[i];
...@@ -965,11 +965,11 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) ...@@ -965,11 +965,11 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
continue; continue;
if ((c == '.') || (c == '-') || (c == '_')) if ((c == '.') || (c == '-') || (c == '_'))
continue; continue;
return invalf(fc, "cgroup1: Invalid name"); return invalfc(fc, "Invalid name");
} }
/* Specifying two names is forbidden */ /* Specifying two names is forbidden */
if (ctx->name) if (ctx->name)
return invalf(fc, "cgroup1: name respecified"); return invalfc(fc, "name respecified");
ctx->name = param->string; ctx->name = param->string;
param->string = NULL; param->string = NULL;
break; break;
...@@ -1004,7 +1004,7 @@ static int check_cgroupfs_options(struct fs_context *fc) ...@@ -1004,7 +1004,7 @@ static int check_cgroupfs_options(struct fs_context *fc)
if (ctx->all_ss) { if (ctx->all_ss) {
/* Mutually exclusive option 'all' + subsystem name */ /* Mutually exclusive option 'all' + subsystem name */
if (ctx->subsys_mask) if (ctx->subsys_mask)
return invalf(fc, "cgroup1: subsys name conflicts with all"); return invalfc(fc, "subsys name conflicts with all");
/* 'all' => select all the subsystems */ /* 'all' => select all the subsystems */
ctx->subsys_mask = enabled; ctx->subsys_mask = enabled;
} }
...@@ -1014,7 +1014,7 @@ static int check_cgroupfs_options(struct fs_context *fc) ...@@ -1014,7 +1014,7 @@ static int check_cgroupfs_options(struct fs_context *fc)
* empty hierarchies must have a name). * empty hierarchies must have a name).
*/ */
if (!ctx->subsys_mask && !ctx->name) if (!ctx->subsys_mask && !ctx->name)
return invalf(fc, "cgroup1: Need name or subsystem set"); return invalfc(fc, "Need name or subsystem set");
/* /*
* Option noprefix was introduced just for backward compatibility * Option noprefix was introduced just for backward compatibility
...@@ -1022,11 +1022,11 @@ static int check_cgroupfs_options(struct fs_context *fc) ...@@ -1022,11 +1022,11 @@ static int check_cgroupfs_options(struct fs_context *fc)
* the cpuset subsystem. * the cpuset subsystem.
*/ */
if ((ctx->flags & CGRP_ROOT_NOPREFIX) && (ctx->subsys_mask & mask)) if ((ctx->flags & CGRP_ROOT_NOPREFIX) && (ctx->subsys_mask & mask))
return invalf(fc, "cgroup1: noprefix used incorrectly"); return invalfc(fc, "noprefix used incorrectly");
/* Can't specify "none" and some subsystems */ /* Can't specify "none" and some subsystems */
if (ctx->subsys_mask && ctx->none) if (ctx->subsys_mask && ctx->none)
return invalf(fc, "cgroup1: none used incorrectly"); return invalfc(fc, "none used incorrectly");
return 0; return 0;
} }
...@@ -1056,7 +1056,7 @@ int cgroup1_reconfigure(struct fs_context *fc) ...@@ -1056,7 +1056,7 @@ int cgroup1_reconfigure(struct fs_context *fc)
/* Don't allow flags or name to change at remount */ /* Don't allow flags or name to change at remount */
if ((ctx->flags ^ root->flags) || if ((ctx->flags ^ root->flags) ||
(ctx->name && strcmp(ctx->name, root->name))) { (ctx->name && strcmp(ctx->name, root->name))) {
errorf(fc, "option or name mismatch, new: 0x%x \"%s\", old: 0x%x \"%s\"", errorfc(fc, "option or name mismatch, new: 0x%x \"%s\", old: 0x%x \"%s\"",
ctx->flags, ctx->name ?: "", root->flags, root->name); ctx->flags, ctx->name ?: "", root->flags, root->name);
ret = -EINVAL; ret = -EINVAL;
goto out_unlock; goto out_unlock;
...@@ -1173,7 +1173,7 @@ static int cgroup1_root_to_use(struct fs_context *fc) ...@@ -1173,7 +1173,7 @@ static int cgroup1_root_to_use(struct fs_context *fc)
* can't create new one without subsys specification. * can't create new one without subsys specification.
*/ */
if (!ctx->subsys_mask && !ctx->none) if (!ctx->subsys_mask && !ctx->none)
return invalf(fc, "cgroup1: No subsys list or none specified"); return invalfc(fc, "No subsys list or none specified");
/* Hierarchies may only be created in the initial cgroup namespace. */ /* Hierarchies may only be created in the initial cgroup namespace. */
if (ctx->ns != &init_cgroup_ns) if (ctx->ns != &init_cgroup_ns)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment