summaryrefslogtreecommitdiffstats
path: root/kernel/cgroup
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2019-01-16 21:23:02 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2019-02-28 03:29:30 -0500
commit7feeef58690a5ea8c5033d43e696ef41b28d82eb (patch)
tree5cb755e3651f3044ab700c509da414a6223bce35 /kernel/cgroup
parent90129625d9203a917fc1d3e4768976ba90d71b44 (diff)
downloadlinux-7feeef58690a5ea8c5033d43e696ef41b28d82eb.tar.gz
linux-7feeef58690a5ea8c5033d43e696ef41b28d82eb.tar.bz2
linux-7feeef58690a5ea8c5033d43e696ef41b28d82eb.zip
cgroup: fold cgroup1_mount() into cgroup1_get_tree()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/cgroup')
-rw-r--r--kernel/cgroup/cgroup-internal.h4
-rw-r--r--kernel/cgroup/cgroup-v1.c26
-rw-r--r--kernel/cgroup/cgroup.c19
3 files changed, 18 insertions, 31 deletions
diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h
index a89cb0ba7a68..37836d598ff8 100644
--- a/kernel/cgroup/cgroup-internal.h
+++ b/kernel/cgroup/cgroup-internal.h
@@ -265,9 +265,7 @@ bool cgroup1_ssid_disabled(int ssid);
void cgroup1_pidlist_destroy_all(struct cgroup *cgrp);
void cgroup1_release_agent(struct work_struct *work);
void cgroup1_check_for_release(struct cgroup *cgrp);
-struct dentry *cgroup1_mount(struct file_system_type *fs_type, int flags,
- void *data, unsigned long magic,
- struct cgroup_namespace *ns);
+int cgroup1_get_tree(struct fs_context *fc);
int cgroup1_reconfigure(struct fs_context *ctx);
#endif /* __CGROUP_INTERNAL_H */
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index e377e19dd3e6..7ae3810dcbdf 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -1113,20 +1113,24 @@ struct kernfs_syscall_ops cgroup1_kf_syscall_ops = {
.show_path = cgroup_show_path,
};
-struct dentry *cgroup1_mount(struct file_system_type *fs_type, int flags,
- void *data, unsigned long magic,
- struct cgroup_namespace *ns)
+int cgroup1_get_tree(struct fs_context *fc)
{
+ struct cgroup_namespace *ns = current->nsproxy->cgroup_ns;
+ struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
struct cgroup_sb_opts opts;
struct cgroup_root *root;
struct cgroup_subsys *ss;
struct dentry *dentry;
int i, ret;
+ /* Check if the caller has permission to mount. */
+ if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN))
+ return -EPERM;
+
cgroup_lock_and_drain_offline(&cgrp_dfl_root.cgrp);
/* First find the desired set of subsystems */
- ret = parse_cgroupfs_options(data, &opts);
+ ret = parse_cgroupfs_options(ctx->data, &opts);
if (ret)
goto out_unlock;
@@ -1228,19 +1232,23 @@ out_free:
kfree(opts.name);
if (ret)
- return ERR_PTR(ret);
+ return ret;
- dentry = cgroup_do_mount(&cgroup_fs_type, flags, root,
+ dentry = cgroup_do_mount(&cgroup_fs_type, fc->sb_flags, root,
CGROUP_SUPER_MAGIC, ns);
+ if (IS_ERR(dentry))
+ return PTR_ERR(dentry);
- if (!IS_ERR(dentry) && percpu_ref_is_dying(&root->cgrp.self.refcnt)) {
+ if (percpu_ref_is_dying(&root->cgrp.self.refcnt)) {
struct super_block *sb = dentry->d_sb;
dput(dentry);
deactivate_locked_super(sb);
msleep(10);
- dentry = ERR_PTR(restart_syscall());
+ return restart_syscall();
}
- return dentry;
+
+ fc->root = dentry;
+ return 0;
}
static int __init cgroup1_wq_init(void)
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 7f7db5f967e3..0652f74064a2 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -2117,25 +2117,6 @@ static int cgroup_get_tree(struct fs_context *fc)
return 0;
}
-static int cgroup1_get_tree(struct fs_context *fc)
-{
- struct cgroup_namespace *ns = current->nsproxy->cgroup_ns;
- struct cgroup_fs_context *ctx = cgroup_fc2context(fc);
- struct dentry *root;
-
- /* Check if the caller has permission to mount. */
- if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN))
- return -EPERM;
-
- root = cgroup1_mount(&cgroup_fs_type, fc->sb_flags, ctx->data,
- CGROUP_SUPER_MAGIC, ns);
- if (IS_ERR(root))
- return PTR_ERR(root);
-
- fc->root = root;
- return 0;
-}
-
static const struct fs_context_operations cgroup_fs_context_ops = {
.free = cgroup_fs_context_free,
.parse_monolithic = cgroup_parse_monolithic,