diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 13:16:50 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 04:17:03 -0400 |
| commit | ceefda6931806972ecf550bd8231dce4a4178953 (patch) | |
| tree | 46ed42a053f1ed43c3c110a21637a7b071657c8a /fs | |
| parent | aed1d84f98738bcc1c605e1ff442de9890441315 (diff) | |
| download | linux-3.10-ceefda6931806972ecf550bd8231dce4a4178953.tar.gz linux-3.10-ceefda6931806972ecf550bd8231dce4a4178953.tar.bz2 linux-3.10-ceefda6931806972ecf550bd8231dce4a4178953.zip | |
switch get_sb_ns() users
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/super.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/super.c b/fs/super.c index f6a7bf1fff2..ca696155cd9 100644 --- a/fs/super.c +++ b/fs/super.c @@ -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) |