From 7a4725e6a9bd6daade16be41d428ee3d6d32d75c Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 30 Jul 2012 02:16:10 -0600
Subject: [PATCH] --- yaml --- r: 322351 b: refs/heads/master c:
 5986802c2fcc754040bb7ed95f30bb16c4a843b7 h: refs/heads/master i:   322349:
 d5b066e2a505f3dca75adff698d4b6d7635bf4ac   322347:
 a86f898c8fd673115bbd13d5a5760ae1658b59c0   322343:
 ca49cc49e6d113ebca3148b5e3a69155c2c84f71   322335:
 d4c0110f4fbf0b4513c0dca1f8856a0d111002bf v: v3

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

diff --git a/[refs] b/[refs]
index 2f7456bd81ed..dc31a7b176f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa2ffd06168e25689e0eb9662bf4595ba2bbac14
+refs/heads/master: 5986802c2fcc754040bb7ed95f30bb16c4a843b7
diff --git a/trunk/fs/btrfs/qgroup.c b/trunk/fs/btrfs/qgroup.c
index bc424ae5a81a..229ef8927e6b 100644
--- a/trunk/fs/btrfs/qgroup.c
+++ b/trunk/fs/btrfs/qgroup.c
@@ -1369,8 +1369,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 
 	if (srcid) {
 		srcgroup = find_qgroup_rb(fs_info, srcid);
-		if (!srcgroup)
+		if (!srcgroup) {
+			ret = -EINVAL;
 			goto unlock;
+		}
 		dstgroup->rfer = srcgroup->rfer - level_size;
 		dstgroup->rfer_cmpr = srcgroup->rfer_cmpr - level_size;
 		srcgroup->excl = level_size;
@@ -1379,8 +1381,10 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
 		qgroup_dirty(fs_info, srcgroup);
 	}
 
-	if (!inherit)
+	if (!inherit) {
+		ret = -EINVAL;
 		goto unlock;
+	}
 
 	i_qgroups = (u64 *)(inherit + 1);
 	for (i = 0; i < inherit->num_qgroups; ++i) {