Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 14:32:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch procfs to ->mount()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2010-07-26 13:12:54 +04:00
parent 579441a39b
commit aed1d84f98
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/proc/root.c
View File

@ -35,8 +35,8 @@ static int proc_set_super(struct super_block *sb, void *data)
return set_anon_super(sb, NULL); return set_anon_super(sb, NULL);
} }
static int proc_get_sb(struct file_system_type *fs_type, static struct dentry *proc_mount(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data, struct vfsmount *mnt) int flags, const char *dev_name, void *data)
{ {
int err; int err;
struct super_block *sb; struct super_block *sb;
@ -61,14 +61,14 @@ static int proc_get_sb(struct file_system_type *fs_type,
sb = sget(fs_type, proc_test_super, proc_set_super, ns); sb = sget(fs_type, proc_test_super, proc_set_super, ns);
if (IS_ERR(sb)) if (IS_ERR(sb))
return PTR_ERR(sb); return ERR_CAST(sb);
if (!sb->s_root) { if (!sb->s_root) {
sb->s_flags = flags; sb->s_flags = flags;
err = proc_fill_super(sb); err = proc_fill_super(sb);
if (err) { if (err) {
deactivate_locked_super(sb); deactivate_locked_super(sb);
return err; return ERR_PTR(err);
} }
ei = PROC_I(sb->s_root->d_inode); ei = PROC_I(sb->s_root->d_inode);
@ -81,8 +81,7 @@ static int proc_get_sb(struct file_system_type *fs_type,
sb->s_flags |= MS_ACTIVE; sb->s_flags |= MS_ACTIVE;
} }
simple_set_mnt(mnt, sb); return dget(sb->s_root);
return 0;
} }
static void proc_kill_sb(struct super_block *sb) static void proc_kill_sb(struct super_block *sb)
@ -96,7 +95,7 @@ static void proc_kill_sb(struct super_block *sb)
static struct file_system_type proc_fs_type = { static struct file_system_type proc_fs_type = {
.name = "proc", .name = "proc",
.get_sb = proc_get_sb, .mount = proc_mount,
.kill_sb = proc_kill_sb, .kill_sb = proc_kill_sb,
}; };