Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

VFS: Don't use save/replace_mount_options if not using generic_show_options 



btrfs, debugfs, reiserfs and tracefs call save_mount_options() and reiserfs
calls replace_mount_options(), but they then implement their own
->show_options() methods and don't touch s_options, rendering the saved
options unnecessary.  I'm trying to eliminate s_options to make it easier
to implement a context-based mount where the mount options can be passed
individually over a file descriptor.

Remove the calls to save/replace_mount_options() call in these cases.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Chris Mason <clm@fb.com>
cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cc: Steven Rostedt <rostedt@goodmis.org>
cc: linux-btrfs@vger.kernel.org
cc: reiserfs-devel@vger.kernel.org
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent cdf01226

fs/btrfs/super.c

+0 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,6 @@ static int btrfs_fill_super(struct super_block *sb, 
		goto fail_close;

	}



	save_mount_options(sb, data);

	cleancache_init_fs(sb);

	sb->s_flags |= MS_ACTIVE;

	return 0;

fs/debugfs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -203,8 +203,6 @@ static int debug_fill_super(struct super_block *sb, void *data, int silent) 
	struct debugfs_fs_info *fsi;

	int err;



	save_mount_options(sb, data);



	fsi = kzalloc(sizeof(struct debugfs_fs_info), GFP_KERNEL);

	sb->s_fs_info = fsi;

	if (!fsi) {

fs/reiserfs/super.c

+0 −4
Original line number Diff line number Diff line
@@ -1599,8 +1599,6 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) 
	}



out_ok_unlocked:

	if (new_opts)

		replace_mount_options(s, new_opts);

	return 0;



out_err_unlock:
@@ -1916,8 +1914,6 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) 
	char *qf_names[REISERFS_MAXQUOTAS] = {};

	unsigned int qfmt = 0;



	save_mount_options(s, data);



	sbi = kzalloc(sizeof(struct reiserfs_sb_info), GFP_KERNEL);

	if (!sbi)

		return -ENOMEM;

fs/tracefs/inode.c

+0 −2
Original line number Diff line number Diff line
@@ -270,8 +270,6 @@ static int trace_fill_super(struct super_block *sb, void *data, int silent) 
	struct tracefs_fs_info *fsi;

	int err;



	save_mount_options(sb, data);



	fsi = kzalloc(sizeof(struct tracefs_fs_info), GFP_KERNEL);

	sb->s_fs_info = fsi;

	if (!fsi) {