diff options
| author | Qu Wenruo <quwenruo@cn.fujitsu.com> | 2015-10-26 02:11:19 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-26 22:44:39 -0400 |
| commit | 90ce321da8ce3d00e19586993887346286208386 (patch) | |
| tree | fc94eab3c20e42b5ff1a2cbb88d81cab3b438b9f /fs/btrfs | |
| parent | 5846a3c26873e86b034c702a8bc202aa76082369 (diff) | |
btrfs: qgroup: Fix a rebase bug which will cause qgroup double free
When rebasing my patchset, I forgot to pick up a cleanup patch to remove
old hotfix in 4.2 release.
Witouth the cleanup, it will screw up new qgroup reserve framework and
always cause minus reserved number.
Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/qgroup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 31d19344427a..46476c226395 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
| @@ -1652,10 +1652,6 @@ static int qgroup_update_counters(struct btrfs_fs_info *fs_info, | |||
| 1652 | } | 1652 | } |
| 1653 | } | 1653 | } |
| 1654 | 1654 | ||
| 1655 | /* For exclusive extent, free its reserved bytes too */ | ||
| 1656 | if (nr_old_roots == 0 && nr_new_roots == 1 && | ||
| 1657 | cur_new_count == nr_new_roots) | ||
| 1658 | qg->reserved -= num_bytes; | ||
| 1659 | if (dirty) | 1655 | if (dirty) |
| 1660 | qgroup_dirty(fs_info, qg); | 1656 | qgroup_dirty(fs_info, qg); |
| 1661 | } | 1657 | } |
