Unverified Commit e062abae authored by Christian Brauner's avatar Christian Brauner
Browse files

super: remove get_tree_single_reconf() 



The get_tree_single_reconf() helper isn't used anywhere. Remove it.

Reviewed-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarAleksa Sarai <cyphar@cyphar.com>
Message-Id: <20230802-vfs-super-exclusive-v2-1-95dc4e41b870@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 06c2afb8

fs/super.c

+5 −23
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ static int test_single_super(struct super_block *s, struct fs_context *fc) 
	return 1;

}



static int vfs_get_super(struct fs_context *fc, bool reconf,

static int vfs_get_super(struct fs_context *fc,

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

		int (*fill_super)(struct super_block *sb,

				  struct fs_context *fc))
@@ -1154,19 +1154,9 @@ static int vfs_get_super(struct fs_context *fc, bool reconf, 
			goto error;



		sb->s_flags |= SB_ACTIVE;

		fc->root = dget(sb->s_root);

	} else {

		fc->root = dget(sb->s_root);

		if (reconf) {

			err = reconfigure_super(fc);

			if (err < 0) {

				dput(fc->root);

				fc->root = NULL;

				goto error;

			}

		}

	}



	fc->root = dget(sb->s_root);

	return 0;



error:
@@ -1178,7 +1168,7 @@ int get_tree_nodev(struct fs_context *fc, 
		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, false, NULL, fill_super);

	return vfs_get_super(fc, NULL, fill_super);

}

EXPORT_SYMBOL(get_tree_nodev);
@@ -1186,25 +1176,17 @@ int get_tree_single(struct fs_context *fc, 
		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, false, test_single_super, fill_super);

	return vfs_get_super(fc, test_single_super, fill_super);

}

EXPORT_SYMBOL(get_tree_single);



int get_tree_single_reconf(struct fs_context *fc,

		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc))

{

	return vfs_get_super(fc, true, test_single_super, fill_super);

}

EXPORT_SYMBOL(get_tree_single_reconf);



int get_tree_keyed(struct fs_context *fc,

		  int (*fill_super)(struct super_block *sb,

				    struct fs_context *fc),

		void *key)

{

	fc->s_fs_info = key;

	return vfs_get_super(fc, false, test_keyed_super, fill_super);

	return vfs_get_super(fc, test_keyed_super, fill_super);

}

EXPORT_SYMBOL(get_tree_keyed);

include/linux/fs_context.h

+0 −3
Original line number Diff line number Diff line
@@ -150,9 +150,6 @@ extern int get_tree_nodev(struct fs_context *fc, 
extern int get_tree_single(struct fs_context *fc,

			 int (*fill_super)(struct super_block *sb,

					   struct fs_context *fc));

extern int get_tree_single_reconf(struct fs_context *fc,

			 int (*fill_super)(struct super_block *sb,

					   struct fs_context *fc));

extern int get_tree_keyed(struct fs_context *fc,

			 int (*fill_super)(struct super_block *sb,

					   struct fs_context *fc),