leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jeffm-discard-4.3' into for-linus-4.3

Browse Source
This commit is contained in:
Chris Mason
2015-08-09 07:35:33 -07:00
parent da2f0f74cf e33e17ee10
commit 46cd28555f
9 changed files with 343 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/btrfs/disk-io.c
View File

@@ -3761,6 +3761,15 @@ void close_ctree(struct btrfs_root *root)
cancel_work_sync(&fs_info->async_reclaim_work);
if (!(fs_info->sb->s_flags & MS_RDONLY)) {
/*
* If the cleaner thread is stopped and there are
* block groups queued for removal, the deletion will be
* skipped when we quit the cleaner thread.
*/
mutex_lock(&root->fs_info->cleaner_mutex);
btrfs_delete_unused_bgs(root->fs_info);
mutex_unlock(&root->fs_info->cleaner_mutex);
ret = btrfs_commit_super(root);
if (ret)
btrfs_err(fs_info, "commit super ret %d", ret);