davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cgroup: fold cgroup1_mount() into cgroup1_get_tree()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2019-01-16 21:23:02 -05:00
parent 90129625d9
commit 7feeef5869
3 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/cgroup/cgroup-internal.h
View File

@ -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 */

26
kernel/cgroup/cgroup-v1.c
View File

@ -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)

19
kernel/cgroup/cgroup.c
View File

@ -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,