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

switch get_sb_ns() users

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 aed1d84f
......@@ -715,15 +715,14 @@ static int ns_set_super(struct super_block *sb, void *data)
return set_anon_super(sb, NULL);
}
int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
int (*fill_super)(struct super_block *, void *, int),
struct vfsmount *mnt)
struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
void *data, int (*fill_super)(struct super_block *, void *, int))
{
struct super_block *sb;
sb = sget(fs_type, ns_test_super, ns_set_super, data);
if (IS_ERR(sb))
return PTR_ERR(sb);
return ERR_CAST(sb);
if (!sb->s_root) {
int err;
......@@ -731,17 +730,16 @@ int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
if (err) {
deactivate_locked_super(sb);
return err;
return ERR_PTR(err);
}
sb->s_flags |= MS_ACTIVE;
}
simple_set_mnt(mnt, sb);
return 0;
return dget(sb->s_root);
}
EXPORT_SYMBOL(get_sb_ns);
EXPORT_SYMBOL(mount_ns);
#ifdef CONFIG_BLOCK
static int set_bdev_super(struct super_block *s, void *data)
......
......@@ -1789,9 +1789,8 @@ struct file_system_type {
struct lock_class_key i_alloc_sem_key;
};
extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data,
int (*fill_super)(struct super_block *, void *, int),
struct vfsmount *mnt);
extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
void *data, int (*fill_super)(struct super_block *, void *, int));
extern struct dentry *mount_bdev(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data,
int (*fill_super)(struct super_block *, void *, int));
......
......@@ -211,13 +211,13 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent)
return error;
}
static int mqueue_get_sb(struct file_system_type *fs_type,
static struct dentry *mqueue_mount(struct file_system_type *fs_type,
int flags, const char *dev_name,
void *data, struct vfsmount *mnt)
void *data)
{
if (!(flags & MS_KERNMOUNT))
data = current->nsproxy->ipc_ns;
return get_sb_ns(fs_type, flags, data, mqueue_fill_super, mnt);
return mount_ns(fs_type, flags, data, mqueue_fill_super);
}
static void init_once(void *foo)
......@@ -1232,7 +1232,7 @@ static const struct super_operations mqueue_super_ops = {
static struct file_system_type mqueue_fs_type = {
.name = "mqueue",
.get_sb = mqueue_get_sb,
.mount = mqueue_mount,
.kill_sb = kill_litter_super,
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册