Merge branch 'fst-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux...

Signed-off-by: Chris Mason <clm@fb.com>

diff --cc fs/btrfs/ctree.h
Simple merge

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

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

diff --cc fs/btrfs/extent_io.h
Simple merge

diff --cc fs/btrfs/free-space-tree.c
index e4a42a8e4f849bf87399bc9ebd03d6989ce2b868,ea605ffd0e030d6c531f21af1ae84a9972ab90cd..57401b474ec6f1d0f050a003bb345c50f58c867f
--- 1/fs/btrfs/free-space-tree.c
--- 2/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@@ -1185,7 -1182,8 +1184,8 @@@ int btrfs_create_free_space_tree(struc
        }
  
        btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
 -      fs_info->creating_free_space_tree = 0;
+       btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);
 +      clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);
  
        ret = btrfs_commit_transaction(trans, tree_root);
        if (ret)