提交 aed1d84f 编写于 作者: A Al Viro

switch procfs to ->mount()

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 579441a3
...@@ -35,8 +35,8 @@ static int proc_set_super(struct super_block *sb, void *data) ...@@ -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, ...@@ -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, ...@@ -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) ...@@ -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,
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册