On Tue 01-08-23 15:09:00, Christian Brauner wrote:
> The get_tree_single_reconf() helper isn't used anywhere. Remote it.
^^ Remove
>
> Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Otherwise looks good to me. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/super.c | 34 ++++++++--------------------------
> include/linux/fs_context.h | 3 ---
> 2 files changed, 8 insertions(+), 29 deletions(-)
>
> diff --git a/fs/super.c b/fs/super.c
> index 3ef39df5bec5..c086ce4929cd 100644
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -1136,10 +1136,10 @@ 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,
> - int (*test)(struct super_block *, struct fs_context *),
> - int (*fill_super)(struct super_block *sb,
> - struct fs_context *fc))
> +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))
> {
> struct super_block *sb;
> int err;
> @@ -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);
>
> diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h
> index ff6341e09925..851b3fe2549c 100644
> --- a/include/linux/fs_context.h
> +++ b/include/linux/fs_context.h
> @@ -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),
>
> --
> 2.34.1
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
