Commit 41d46b29 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ad21f15b

fs/btrfs/disk-io.c

+0 −23
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/super.c

+25 −0
Original line number Diff line number Diff line
@@ -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)