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-06 05:02:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch get_sb_ns() users

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

14
fs/super.c
View File

@ -715,15 +715,14 @@ static int ns_set_super(struct super_block *sb, void *data)
return set_anon_super(sb, NULL); return set_anon_super(sb, NULL);
} }
int get_sb_ns(struct file_system_type *fs_type, int flags, void *data, struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
int (*fill_super)(struct super_block *, void *, int), void *data, int (*fill_super)(struct super_block *, void *, int))
struct vfsmount *mnt)
{ {
struct super_block *sb; struct super_block *sb;
sb = sget(fs_type, ns_test_super, ns_set_super, data); sb = sget(fs_type, ns_test_super, ns_set_super, data);
if (IS_ERR(sb)) if (IS_ERR(sb))
return PTR_ERR(sb); return ERR_CAST(sb);
if (!sb->s_root) { if (!sb->s_root) {
int err; 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); err = fill_super(sb, data, flags & MS_SILENT ? 1 : 0);
if (err) { if (err) {
deactivate_locked_super(sb); deactivate_locked_super(sb);
return err; return ERR_PTR(err);
} }
sb->s_flags |= MS_ACTIVE; sb->s_flags |= MS_ACTIVE;
} }
simple_set_mnt(mnt, sb); return dget(sb->s_root);
return 0;
} }
EXPORT_SYMBOL(get_sb_ns); EXPORT_SYMBOL(mount_ns);
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
static int set_bdev_super(struct super_block *s, void *data) static int set_bdev_super(struct super_block *s, void *data)

5
include/linux/fs.h
View File

@ -1789,9 +1789,8 @@ struct file_system_type {
struct lock_class_key i_alloc_sem_key; struct lock_class_key i_alloc_sem_key;
}; };
extern int get_sb_ns(struct file_system_type *fs_type, int flags, void *data, extern struct dentry *mount_ns(struct file_system_type *fs_type, int flags,
int (*fill_super)(struct super_block *, void *, int), void *data, int (*fill_super)(struct super_block *, void *, int));
struct vfsmount *mnt);
extern struct dentry *mount_bdev(struct file_system_type *fs_type, extern struct dentry *mount_bdev(struct file_system_type *fs_type,
int flags, const char *dev_name, void *data, int flags, const char *dev_name, void *data,
int (*fill_super)(struct super_block *, void *, int)); int (*fill_super)(struct super_block *, void *, int));

8
ipc/mqueue.c
View File

@ -211,13 +211,13 @@ static int mqueue_fill_super(struct super_block *sb, void *data, int silent)
return error; 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, int flags, const char *dev_name,
void *data, struct vfsmount *mnt) void *data)
{ {
if (!(flags & MS_KERNMOUNT)) if (!(flags & MS_KERNMOUNT))
data = current->nsproxy->ipc_ns; 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) 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 = { static struct file_system_type mqueue_fs_type = {
.name = "mqueue", .name = "mqueue",
.get_sb = mqueue_get_sb, .mount = mqueue_mount,
.kill_sb = kill_litter_super, .kill_sb = kill_litter_super,
}; };