From c088bf9204e543af8a93167c5e57f8d58d3c9020 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 30 Jul 2012 02:15:43 -0600
Subject: [PATCH] --- yaml --- r: 322352 b: refs/heads/master c:
 57a5a882031dba5cb7bc7ebc955b897498365fe2 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/btrfs/qgroup.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc31a7b176f2..e4a8ecf70f28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5986802c2fcc754040bb7ed95f30bb16c4a843b7
+refs/heads/master: 57a5a882031dba5cb7bc7ebc955b897498365fe2
diff --git a/trunk/fs/btrfs/qgroup.c b/trunk/fs/btrfs/qgroup.c
index 229ef8927e6b..38b42e7bc91d 100644
--- a/trunk/fs/btrfs/qgroup.c
+++ b/trunk/fs/btrfs/qgroup.c
@@ -1364,8 +1364,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 	spin_lock(&fs_info->qgroup_lock);
 
 	dstgroup = add_qgroup_rb(fs_info, objectid);
-	if (!dstgroup)
+	if (IS_ERR(dstgroup)) {
+		ret = PTR_ERR(dstgroup);
 		goto unlock;
+	}
 
 	if (srcid) {
 		srcgroup = find_qgroup_rb(fs_info, srcid);