Commit bb7b6b2b authored by David Howells's avatar David Howells Committed by Al Viro
Browse files

vfs: Kill mount_ns() 



Kill mount_ns() as it has been replaced by vfs_get_super() in the new mount
API.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 96a374a3

fs/super.c

+0 −38
Original line number Diff line number Diff line
@@ -1143,44 +1143,6 @@ void kill_litter_super(struct super_block *sb) 
}

EXPORT_SYMBOL(kill_litter_super);



static int ns_test_super(struct super_block *sb, void *data)

{

	return sb->s_fs_info == data;

}



static int ns_set_super(struct super_block *sb, void *data)

{

	sb->s_fs_info = data;

	return set_anon_super(sb, NULL);

}



struct dentry *mount_ns(struct file_system_type *fs_type,

	int flags, void *data, void *ns, struct user_namespace *user_ns,

	int (*fill_super)(struct super_block *, void *, int))

{

	struct super_block *sb;



	sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags,

			 user_ns, ns);

	if (IS_ERR(sb))

		return ERR_CAST(sb);



	if (!sb->s_root) {

		int err;

		err = fill_super(sb, data, flags & SB_SILENT ? 1 : 0);

		if (err) {

			deactivate_locked_super(sb);

			return ERR_PTR(err);

		}



		sb->s_flags |= SB_ACTIVE;

	}



	return dget(sb->s_root);

}



EXPORT_SYMBOL(mount_ns);



int set_anon_super_fc(struct super_block *sb, struct fs_context *fc)

{

	return set_anon_super(sb, NULL);

include/linux/fs.h

+0 −3
Original line number Diff line number Diff line
@@ -2206,9 +2206,6 @@ struct file_system_type { 


#define MODULE_ALIAS_FS(NAME) MODULE_ALIAS("fs-" NAME)



extern struct dentry *mount_ns(struct file_system_type *fs_type,

	int flags, void *data, void *ns, struct user_namespace *user_ns,

	int (*fill_super)(struct super_block *, void *, int));

#ifdef CONFIG_BLOCK

extern struct dentry *mount_bdev(struct file_system_type *fs_type,

	int flags, const char *dev_name, void *data,