Commit 6207c9e3 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: set default compress type at btrfs_init_fs_info time 



With the new mount API we'll be setting our compression well before we
call open_ctree.  We don't want to overwrite our settings, so set the
default in btrfs_init_fs_info instead of open_ctree.

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 2b41b19d

fs/btrfs/disk-io.c

+3 −7
Original line number Diff line number Diff line
@@ -2807,6 +2807,9 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) 
	fs_info->sectorsize_bits = ilog2(4096);

	fs_info->stripesize = 4096;



	/* Default compress algorithm when user does -o compress */

	fs_info->compress_type = BTRFS_COMPRESS_ZLIB;



	fs_info->max_extent_size = BTRFS_MAX_EXTENT_SIZE;



	spin_lock_init(&fs_info->swapfile_pins_lock);
@@ -3289,13 +3292,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	if (btrfs_super_flags(disk_super) & BTRFS_SUPER_FLAG_ERROR)

		WRITE_ONCE(fs_info->fs_error, -EUCLEAN);



	/*

	 * In the long term, we'll store the compression type in the super

	 * block, and it'll be used for per file compression control.

	 */

	fs_info->compress_type = BTRFS_COMPRESS_ZLIB;





	/* Set up fs_info before parsing mount options */

	nodesize = btrfs_super_nodesize(disk_super);

	sectorsize = btrfs_super_sectorsize(disk_super);