diff options
author | 2016-10-12 13:16:00 -0700 | |
---|---|---|
committer | 2016-10-12 13:16:00 -0700 | |
commit | d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e (patch) | |
tree | ddc02c4207fc2c828ea4612d45f4af32d5dc292f /fs/btrfs/ctree.h | |
parent | Revert "btrfs: let btrfs_delete_unused_bgs() to clean relocated bgs" (diff) | |
parent | btrfs: tests: uninline member definitions in free_space_extent (diff) | |
download | linux-d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e.tar.gz linux-d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e.tar.bz2 linux-d9ed71e5457c8c5bf1dc706e06468eab9e2aa87e.zip |
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>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index bf7cb6da78e6..9d8edcb0813c 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -252,7 +252,8 @@ struct btrfs_super_block { #define BTRFS_FEATURE_COMPAT_SAFE_CLEAR 0ULL #define BTRFS_FEATURE_COMPAT_RO_SUPP \ - (BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE) + (BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE | \ + BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE_VALID) #define BTRFS_FEATURE_COMPAT_RO_SAFE_SET 0ULL #define BTRFS_FEATURE_COMPAT_RO_SAFE_CLEAR 0ULL |