diff options
author | Josef Bacik <jbacik@fusionio.com> | 2013-10-07 15:14:44 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 21:56:17 -0500 |
commit | 2b1360da35877cd969ed83884d8989ba778254d0 (patch) | |
tree | d3a6cdd5f0389f3d5859aaf599a18b0a058a7f51 /fs/btrfs/disk-io.c | |
parent | 681ae50917df9fd1fae2571fb36a579d1e872b12 (diff) | |
download | kernel-common-2b1360da35877cd969ed83884d8989ba778254d0.tar.gz kernel-common-2b1360da35877cd969ed83884d8989ba778254d0.tar.bz2 kernel-common-2b1360da35877cd969ed83884d8989ba778254d0.zip |
Btrfs: free up block groups after everything
If we abort a transaction we will do the tree log cleanup at unmount, but this
happens after we free up the block groups. This makes all the leak detection
warnings go off because we think we've leaked space but in reality we just
haven't cleaned it up yet. So instead do the block group cleanup stuff after
free'ing the fs roots so we don't get these warnings. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index fdc75ab09483..419968e3eaa0 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -3637,12 +3637,12 @@ int close_ctree(struct btrfs_root *root) percpu_counter_sum(&fs_info->delalloc_bytes)); } - btrfs_free_block_groups(fs_info); - btrfs_stop_all_workers(fs_info); del_fs_roots(fs_info); + btrfs_free_block_groups(fs_info); + free_root_pointers(fs_info, 1); iput(fs_info->btree_inode); |