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

[linux.git] / kernel / cgroup / cgroup-v1.c

diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index 09f3a413f6f89625398c9c5eb378c29fee986dfe..be1a1c83cdd1808a16d695ef42370cd667fd5aed 100644 (file)
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -18,8 +18,6 @@
 
 #include <trace/events/cgroup.h>
 
-#define cg_invalf(fc, fmt, ...) invalf(fc, fmt, ## __VA_ARGS__)
-
 /*
  * pidlists linger the following amount before being destroyed.  The goal
  * is avoiding frequent destruction in the middle of consecutive read calls
@@ -887,7 +885,7 @@ enum cgroup1_param {
        Opt_xattr,
 };
 
-static const struct fs_parameter_spec cgroup1_param_specs[] = {
+const struct fs_parameter_spec cgroup1_fs_parameters[] = {
        fsparam_flag  ("all",           Opt_all),
        fsparam_flag  ("clone_children", Opt_clone_children),
        fsparam_flag  ("cpuset_v2_mode", Opt_cpuset_v2_mode),
@@ -899,11 +897,6 @@ static const struct fs_parameter_spec cgroup1_param_specs[] = {
        {}
 };
 
-const struct fs_parameter_description cgroup1_fs_parameters = {
-       .name           = "cgroup1",
-       .specs          = cgroup1_param_specs,
-};
-
 int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
 {
        struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
@@ -911,7 +904,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
        struct fs_parse_result result;
        int opt, i;
 
-       opt = fs_parse(fc, &cgroup1_fs_parameters, param, &result);
+       opt = fs_parse(fc, cgroup1_fs_parameters, param, &result);
        if (opt == -ENOPARAM) {
                if (strcmp(param->key, "source") == 0) {
                        fc->source = param->string;
@@ -924,7 +917,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
                        ctx->subsys_mask |= (1 << i);
                        return 0;
                }
-               return cg_invalf(fc, "cgroup1: Unknown subsys name '%s'", param->key);
+               return invalfc(fc, "Unknown subsys name '%s'", param->key);
        }
        if (opt < 0)
                return opt;
@@ -952,7 +945,7 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
        case Opt_release_agent:
                /* Specifying two release agents is forbidden */
                if (ctx->release_agent)
-                       return cg_invalf(fc, "cgroup1: release_agent respecified");
+                       return invalfc(fc, "release_agent respecified");
                ctx->release_agent = param->string;
                param->string = NULL;
                break;
@@ -962,9 +955,9 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
                        return -ENOENT;
                /* Can't specify an empty name */
                if (!param->size)
-                       return cg_invalf(fc, "cgroup1: Empty name");
+                       return invalfc(fc, "Empty name");
                if (param->size > MAX_CGROUP_ROOT_NAMELEN - 1)
-                       return cg_invalf(fc, "cgroup1: Name too long");
+                       return invalfc(fc, "Name too long");
                /* Must match [\w.-]+ */
                for (i = 0; i < param->size; i++) {
                        char c = param->string[i];
@@ -972,11 +965,11 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param)
                                continue;
                        if ((c == '.') || (c == '-') || (c == '_'))
                                continue;
-                       return cg_invalf(fc, "cgroup1: Invalid name");
+                       return invalfc(fc, "Invalid name");
                }
                /* Specifying two names is forbidden */
                if (ctx->name)
-                       return cg_invalf(fc, "cgroup1: name respecified");
+                       return invalfc(fc, "name respecified");
                ctx->name = param->string;
                param->string = NULL;
                break;
@@ -1011,7 +1004,7 @@ static int check_cgroupfs_options(struct fs_context *fc)
        if (ctx->all_ss) {
                /* Mutually exclusive option 'all' + subsystem name */
                if (ctx->subsys_mask)
-                       return cg_invalf(fc, "cgroup1: subsys name conflicts with all");
+                       return invalfc(fc, "subsys name conflicts with all");
                /* 'all' => select all the subsystems */
                ctx->subsys_mask = enabled;
        }
@@ -1021,7 +1014,7 @@ static int check_cgroupfs_options(struct fs_context *fc)
         * empty hierarchies must have a name).
         */
        if (!ctx->subsys_mask && !ctx->name)
-               return cg_invalf(fc, "cgroup1: Need name or subsystem set");
+               return invalfc(fc, "Need name or subsystem set");
 
        /*
         * Option noprefix was introduced just for backward compatibility
@@ -1029,11 +1022,11 @@ static int check_cgroupfs_options(struct fs_context *fc)
         * the cpuset subsystem.
         */
        if ((ctx->flags & CGRP_ROOT_NOPREFIX) && (ctx->subsys_mask & mask))
-               return cg_invalf(fc, "cgroup1: noprefix used incorrectly");
+               return invalfc(fc, "noprefix used incorrectly");
 
        /* Can't specify "none" and some subsystems */
        if (ctx->subsys_mask && ctx->none)
-               return cg_invalf(fc, "cgroup1: none used incorrectly");
+               return invalfc(fc, "none used incorrectly");
 
        return 0;
 }
@@ -1063,7 +1056,7 @@ int cgroup1_reconfigure(struct fs_context *fc)
        /* Don't allow flags or name to change at remount */
        if ((ctx->flags ^ root->flags) ||
            (ctx->name && strcmp(ctx->name, root->name))) {
-               cg_invalf(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);
                ret = -EINVAL;
                goto out_unlock;
@@ -1180,7 +1173,7 @@ static int cgroup1_root_to_use(struct fs_context *fc)
         * can't create new one without subsys specification.
         */
        if (!ctx->subsys_mask && !ctx->none)
-               return cg_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. */
        if (ctx->ns != &init_cgroup_ns)