From: Chris Mason <clm@fb.com>
Date: Wed, 12 Oct 2016 20:16:00 +0000 (-0700)
Subject: Merge branch 'fst-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e;p=linux-beck.git

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

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

d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e
diff --cc fs/btrfs/free-space-tree.c
index e4a42a8e4f84,ea605ffd0e03..57401b474ec6
--- a/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);
+ 	btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE_VALID);
 -	fs_info->creating_free_space_tree = 0;
 +	clear_bit(BTRFS_FS_CREATING_FREE_SPACE_TREE, &fs_info->flags);
  
  	ret = btrfs_commit_transaction(trans, tree_root);
  	if (ret)