diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 13:23:11 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:17:06 -0400 |
| commit | f7e835710ab5f6e43933c983f38f2d2e262b718c (patch) | |
| tree | 6acdc8212053398e6913dc5c0d8392edcf202f05 /kernel/cpuset.c | |
| parent | ceefda6931806972ecf550bd8231dce4a4178953 (diff) | |
| download | kernel-common-f7e835710ab5f6e43933c983f38f2d2e262b718c.tar.gz kernel-common-f7e835710ab5f6e43933c983f38f2d2e262b718c.tar.bz2 kernel-common-f7e835710ab5f6e43933c983f38f2d2e262b718c.zip | |
convert cgroup and cpuset
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'kernel/cpuset.c')
| -rw-r--r-- | kernel/cpuset.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 51b143e2a07a..4349935c2ad8 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -231,18 +231,17 @@ static DEFINE_SPINLOCK(cpuset_buffer_lock); * users. If someone tries to mount the "cpuset" filesystem, we * silently switch it to mount "cgroup" instead */ -static int cpuset_get_sb(struct file_system_type *fs_type, - int flags, const char *unused_dev_name, - void *data, struct vfsmount *mnt) +static struct dentry *cpuset_mount(struct file_system_type *fs_type, + int flags, const char *unused_dev_name, void *data) { struct file_system_type *cgroup_fs = get_fs_type("cgroup"); - int ret = -ENODEV; + struct dentry *ret = ERR_PTR(-ENODEV); if (cgroup_fs) { char mountopts[] = "cpuset,noprefix," "release_agent=/sbin/cpuset_release_agent"; - ret = cgroup_fs->get_sb(cgroup_fs, flags, - unused_dev_name, mountopts, mnt); + ret = cgroup_fs->mount(cgroup_fs, flags, + unused_dev_name, mountopts); put_filesystem(cgroup_fs); } return ret; @@ -250,7 +249,7 @@ static int cpuset_get_sb(struct file_system_type *fs_type, static struct file_system_type cpuset_fs_type = { .name = "cpuset", - .get_sb = cpuset_get_sb, + .mount = cpuset_mount, }; /* |