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: David 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: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4f1cdd5058f12b9970b5894828498624a28c77b5..8e9758b3eb232f1f07e4f60b3d4ed4ed9003729c 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -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;

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index e892ae7d89f8bc078848d8752affa1598a7e1e11..0dc9e9c0e0f813ef7b85baf0bff4d8918f7267c4 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -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) {

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 685f1e05699868cf59237cec9d3821b1ae2e1a61..306e4e9d172d4579206dd4367612a89059ea3c41 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -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;

diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index 328e89c2cf835d4ff3cec1572ae30a30621fa183..bea8ad876bf9a407949008cc651d4559bcb67e60 100644 (file)
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -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) {