Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

btrfs: free block groups after free'ing fs trees

Sometimes when running generic/475 we would trip the
WARN_ON(cache->reserved) check when free'ing the block groups on umount.
This is because sometimes we don't commit the transaction because of IO
errors and thus do not cleanup the tree logs until at umount time.

These blocks are still reserved until they are cleaned up, but they
aren't cleaned up until _after_ we do the free block groups work. Fix
this by moving the free after free'ing the fs roots, that way all of the
tree logs are cleaned up and we have a properly cleaned fs. A bunch of
loops of generic/475 confirmed this fixes the problem.

CC: stable@vger.kernel.org # 4.9+
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

authored by

Josef Bacik and committed by
David Sterba
4e19443d 1362089d

+9 -2
+9 -2
fs/btrfs/disk-io.c
··· 4030 4030 invalidate_inode_pages2(fs_info->btree_inode->i_mapping); 4031 4031 btrfs_stop_all_workers(fs_info); 4032 4032 4033 - btrfs_free_block_groups(fs_info); 4034 - 4035 4033 clear_bit(BTRFS_FS_OPEN, &fs_info->flags); 4036 4034 free_root_pointers(fs_info, true); 4035 + 4036 + /* 4037 + * We must free the block groups after dropping the fs_roots as we could 4038 + * have had an IO error and have left over tree log blocks that aren't 4039 + * cleaned up until the fs roots are freed. This makes the block group 4040 + * accounting appear to be wrong because there's pending reserved bytes, 4041 + * so make sure we do the block group cleanup afterwards. 4042 + */ 4043 + btrfs_free_block_groups(fs_info); 4037 4044 4038 4045 iput(fs_info->btree_inode); 4039 4046