Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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.
+5
+5
fs/btrfs/qgroup.c
+5
fs/btrfs/qgroup.c
···
1651
1651
/* Exclusive -> exclusive, nothing changed */
1652
1652
}
1653
1653
}
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;
1654
1659
if (dirty)
1655
1660
qgroup_dirty(fs_info, qg);
1656
1661
}