btrfs: move the device specific mount options to super.c

We add these mount options based on the fs_devices settings, which can
be set once we've opened the fs_devices.  Move these into their own
helper and call it from get_tree_super.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Acked-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index beae0dbbc03970ec88c2fb8c3fe5297cbfc1ab50..42e6d818a5a89c0d227ebe7bd50be06deb114b56 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3510,29 +3510,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
                goto fail_cleaner;
        }
 
-       if (!btrfs_test_opt(fs_info, NOSSD) &&
-           !fs_info->fs_devices->rotating) {
-               btrfs_set_and_info(fs_info, SSD, "enabling ssd optimizations");
-       }
-
-       /*
-        * For devices supporting discard turn on discard=async automatically,
-        * unless it's already set or disabled. This could be turned off by
-        * nodiscard for the same mount.
-        *
-        * The zoned mode piggy backs on the discard functionality for
-        * resetting a zone. There is no reason to delay the zone reset as it is
-        * fast enough. So, do not enable async discard for zoned mode.
-        */
-       if (!(btrfs_test_opt(fs_info, DISCARD_SYNC) ||
-             btrfs_test_opt(fs_info, DISCARD_ASYNC) ||
-             btrfs_test_opt(fs_info, NODISCARD)) &&
-           fs_info->fs_devices->discardable &&
-           !btrfs_is_zoned(fs_info)) {
-               btrfs_set_and_info(fs_info, DISCARD_ASYNC,
-                                  "auto enabling async discard");
-       }
-
        ret = btrfs_read_qgroup_config(fs_info);
        if (ret)
                goto fail_trans_kthread;

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 4ff26c00eebe1951e89bdd825128d766a24b61ab..4cb9d35d71f8eeff261e204fb687a6b7e268fc32 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -828,6 +828,29 @@ void btrfs_set_free_space_cache_settings(struct btrfs_fs_info *fs_info)
                btrfs_set_opt(fs_info->mount_opt, SPACE_CACHE);
 }
 
+static void set_device_specific_options(struct btrfs_fs_info *fs_info)
+{
+       if (!btrfs_test_opt(fs_info, NOSSD) &&
+           !fs_info->fs_devices->rotating)
+               btrfs_set_opt(fs_info->mount_opt, SSD);
+
+       /*
+        * For devices supporting discard turn on discard=async automatically,
+        * unless it's already set or disabled. This could be turned off by
+        * nodiscard for the same mount.
+        *
+        * The zoned mode piggy backs on the discard functionality for
+        * resetting a zone. There is no reason to delay the zone reset as it is
+        * fast enough. So, do not enable async discard for zoned mode.
+        */
+       if (!(btrfs_test_opt(fs_info, DISCARD_SYNC) ||
+             btrfs_test_opt(fs_info, DISCARD_ASYNC) ||
+             btrfs_test_opt(fs_info, NODISCARD)) &&
+           fs_info->fs_devices->discardable &&
+           !btrfs_is_zoned(fs_info))
+               btrfs_set_opt(fs_info->mount_opt, DISCARD_ASYNC);
+}
+
 static int parse_rescue_options(struct btrfs_fs_info *info, const char *options)
 {
        char *opts;
@@ -2876,6 +2899,8 @@ static int btrfs_get_tree_super(struct fs_context *fc)
                goto error;
        }
 
+       set_device_specific_options(fs_info);
+
        if (sb->s_root) {
                btrfs_close_devices(fs_devices);
                if ((fc->sb_flags ^ sb->s_flags) & SB_RDONLY)