Merge branch 'misc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/inode-map.c
Simple merge

diff --cc fs/btrfs/ioctl.c
Simple merge

diff --cc fs/btrfs/super.c
index 86f7fdc0563388b9122bf6abdb88b68ebec2ac85,3225ac36540843d58c75fef396611f184b53f388..a8e049ae933dc0eea7bba35f7a2d598029a4f94a
--- 1/fs/btrfs/super.c
--- 2/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)

diff --cc fs/btrfs/volumes.c
Simple merge