From: Chris Mason <clm@fb.com>
Date: Wed, 20 Jan 2016 02:21:30 +0000 (-0800)
Subject: Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave... 
X-Git-Tag: v4.5-rc1~21^2~14
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=326f784281fbbdcd91bb401b2a3e32132c0f5c72;p=cascardo%2Flinux.git

Merge branch 'misc-for-4.5' of git://git./linux/kernel/git/kdave/linux into for-linus-4.5
---

326f784281fbbdcd91bb401b2a3e32132c0f5c72
diff --cc fs/btrfs/super.c
index 86f7fdc05633,3225ac365408..a8e049ae933d
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@@ -383,11 -381,12 +383,14 @@@ int btrfs_parse_options(struct btrfs_ro
  	int ret = 0;
  	char *compress_type;
  	bool compress_force = false;
+ 	enum btrfs_compression_type saved_compress_type;
+ 	bool saved_compress_force;
+ 	int no_compress = 0;
  
  	cache_gen = btrfs_super_cache_generation(root->fs_info->super_copy);
 -	if (cache_gen)
 +	if (btrfs_fs_compat_ro(root->fs_info, FREE_SPACE_TREE))
 +		btrfs_set_opt(info->mount_opt, FREE_SPACE_TREE);
 +	else if (cache_gen)
  		btrfs_set_opt(info->mount_opt, SPACE_CACHE);
  
  	if (!options)