summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2015-04-18 05:22:48 -0700
committerChris Mason <clm@fb.com>2015-04-26 06:26:58 -0700
commite4c88f007be78d38eaef316c599a1ee2f0272c15 (patch)
tree738af0712562d398e507f565f827d6210de41605 /fs
parent24b89d08ef63f9c62e55593e27a55e57b0062046 (diff)
downloadlinux-stable-e4c88f007be78d38eaef316c599a1ee2f0272c15.tar.gz
linux-stable-e4c88f007be78d38eaef316c599a1ee2f0272c15.tar.bz2
linux-stable-e4c88f007be78d38eaef316c599a1ee2f0272c15.zip
Btrfs: don't check for delalloc_bytes in cache_save_setup
Now that we're doing free space cache writeback outside the critical section in the commit, there is a bigger window for delalloc_bytes to be added after a cache has been written. find_free_extent may do this without putting the block group back into the dirty list, and also without a transaction running. Checking for delalloc_bytes in cache_save_setup means we might leave the cache marked as written without invalidating it. Consistency checks during mount will toss the cache, but it's better to get rid of the check in cache_save_setup and let it get invalidated by the checks already done during cache write out. Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/extent-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index eeb429cafcb5..6f420c8efdaf 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -3305,8 +3305,7 @@ again:
spin_lock(&block_group->lock);
if (block_group->cached != BTRFS_CACHE_FINISHED ||
- !btrfs_test_opt(root, SPACE_CACHE) ||
- block_group->delalloc_bytes) {
+ !btrfs_test_opt(root, SPACE_CACHE)) {
/*
* don't bother trying to write stuff out _if_
* a) we're not cached,