summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-09 05:56:31 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-09 05:56:31 +0300
commitaf0b3152bbfebd3f8291fd61988c12ece4f60f57 (patch)
tree1c3b80fc15b7d4880d8bb67f39ddd4e78db504fd /fs
parentbae1577e3df471f6752e4b15380d6c67e8e17e8f (diff)
parentc05f9429e12da7c7de2649ef8c8c16bf8c12061f (diff)
downloadop-kernel-dev-af0b3152bbfebd3f8291fd61988c12ece4f60f57.zip
op-kernel-dev-af0b3152bbfebd3f8291fd61988c12ece4f60f57.tar.gz
Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason: "We have a btrfs quota regression fix. I merged this one on Thursday and have run it through tests against current master. Normally I wouldn't have sent this while you were finalizing rc6, but I'm feeding mosquitoes in the adirondacks next week, so I wanted to get this one out before leaving. I'll leave longer tests running and check on things during the week, but I don't expect any problems" * 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: btrfs: qgroup: Fix a regression in qgroup reserved space.
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/qgroup.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index e9ace09..8a82029 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1651,6 +1651,11 @@ static int qgroup_update_counters(struct btrfs_fs_info *fs_info,
/* Exclusive -> exclusive, nothing changed */
}
}
+
+ /* For exclusive extent, free its reserved bytes too */
+ if (nr_old_roots == 0 && nr_new_roots == 1 &&
+ cur_new_count == nr_new_roots)
+ qg->reserved -= num_bytes;
if (dirty)
qgroup_dirty(fs_info, qg);
}
OpenPOWER on IntegriCloud