Commit 676db4af043014e852f67ba0349dae0071bd11f3

Authored by Greg KH
Committed by Greg Kroah-Hartman
1 parent 45daef0fdc

cgroupfs: create /sys/fs/cgroup to mount cgroupfs on

We really shouldn't be asking userspace to create new root filesystems.
So follow along with all of the other in-kernel filesystems, and provide
a mount point in sysfs.

For cgroupfs, this should be in /sys/fs/cgroup/  This change provides
that mount point when the cgroup filesystem is registered in the kernel.

Acked-by: Paul Menage <menage@google.com>
Acked-by: Dhaval Giani <dhaval.giani@gmail.com>
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Lennart Poettering <lennart@poettering.net>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 1 changed file with 12 additions and 1 deletions Side-by-side Diff

... ... @@ -1623,6 +1623,8 @@
1623 1623 .kill_sb = cgroup_kill_sb,
1624 1624 };
1625 1625  
  1626 +static struct kobject *cgroup_kobj;
  1627 +
1626 1628 static inline struct cgroup *__d_cgrp(struct dentry *dentry)
1627 1629 {
1628 1630 return dentry->d_fsdata;
1629 1631  
1630 1632  
... ... @@ -3894,9 +3896,18 @@
3894 3896 hhead = css_set_hash(init_css_set.subsys);
3895 3897 hlist_add_head(&init_css_set.hlist, hhead);
3896 3898 BUG_ON(!init_root_id(&rootnode));
  3899 +
  3900 + cgroup_kobj = kobject_create_and_add("cgroup", fs_kobj);
  3901 + if (!cgroup_kobj) {
  3902 + err = -ENOMEM;
  3903 + goto out;
  3904 + }
  3905 +
3897 3906 err = register_filesystem(&cgroup_fs_type);
3898   - if (err < 0)
  3907 + if (err < 0) {
  3908 + kobject_put(cgroup_kobj);
3899 3909 goto out;
  3910 + }
3900 3911  
3901 3912 proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations);
3902 3913