a btrfs fix

Hi Linus,

My for-linus branch has one revert in the new quota code:

git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git for-linus

We're building up more fixes at etc for the next merge window, but I'm keeping them out unless they are bigger regressions or have a huge impact.

Chris Mason (1):
Revert "Btrfs: fix some error codes in btrfs_qgroup_inherit()"

 fs/btrfs/qgroup.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)