git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
fs
/
btrfs
/
extent-tree.c
diff --git
a/fs/btrfs/extent-tree.c
b/fs/btrfs/extent-tree.c
index
0c097f3
..
bcd59c7
100644
(file)
--- a/
fs/btrfs/extent-tree.c
+++ b/
fs/btrfs/extent-tree.c
@@
-3412,7
+3412,7
@@
again:
* our reservation.
*/
if (unused <= space_info->total_bytes) {
- unused
-= space_info->total_bytes
;
+ unused
= space_info->total_bytes - unused
;
if (unused >= num_bytes) {
if (!reserved)
space_info->bytes_reserved += orig_bytes;