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

vfs: Kill sget_userns() 



Kill sget_userns(), folding it into sget() as that's the only remaining
user.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: linux-fsdevel@vger.kernel.org
parent db2c246a

fs/super.c

+16 −38
Original line number Diff line number Diff line
@@ -563,24 +563,31 @@ struct super_block *sget_fc(struct fs_context *fc, 
EXPORT_SYMBOL(sget_fc);



/**

 *	sget_userns -	find or create a superblock

 *	sget	-	find or create a superblock

 *	@type:	  filesystem type superblock should belong to

 *	@test:	  comparison callback

 *	@set:	  setup callback

 *	@flags:	  mount flags

 *	@user_ns: User namespace for the super_block

 *	@data:	  argument to each of them

 */

struct super_block *sget_userns(struct file_system_type *type,

struct super_block *sget(struct file_system_type *type,

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

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

			int flags, struct user_namespace *user_ns,

			int flags,

			void *data)

{

	struct user_namespace *user_ns = current_user_ns();

	struct super_block *s = NULL;

	struct super_block *old;

	int err;



	/* We don't yet pass the user namespace of the parent

	 * mount through to here so always use &init_user_ns

	 * until that changes.

	 */

	if (flags & SB_SUBMOUNT)

		user_ns = &init_user_ns;



retry:

	spin_lock(&sb_lock);

	if (test) {
@@ -621,35 +628,6 @@ struct super_block *sget_userns(struct file_system_type *type, 
	register_shrinker_prepared(&s->s_shrink);

	return s;

}



EXPORT_SYMBOL(sget_userns);



/**

 *	sget	-	find or create a superblock

 *	@type:	  filesystem type superblock should belong to

 *	@test:	  comparison callback

 *	@set:	  setup callback

 *	@flags:	  mount flags

 *	@data:	  argument to each of them

 */

struct super_block *sget(struct file_system_type *type,

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

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

			int flags,

			void *data)

{

	struct user_namespace *user_ns = current_user_ns();



	/* We don't yet pass the user namespace of the parent

	 * mount through to here so always use &init_user_ns

	 * until that changes.

	 */

	if (flags & SB_SUBMOUNT)

		user_ns = &init_user_ns;



	return sget_userns(type, test, set, flags, user_ns, data);

}



EXPORT_SYMBOL(sget);



void drop_super(struct super_block *sb)

include/linux/fs.h

+0 −5
Original line number Diff line number Diff line
@@ -2245,11 +2245,6 @@ void free_anon_bdev(dev_t); 
struct super_block *sget_fc(struct fs_context *fc,

			    int (*test)(struct super_block *, struct fs_context *),

			    int (*set)(struct super_block *, struct fs_context *));

struct super_block *sget_userns(struct file_system_type *type,

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

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

			int flags, struct user_namespace *user_ns,

			void *data);

struct super_block *sget(struct file_system_type *type,

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

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