---

yaml --- r: 322352 b: refs/heads/master c: 57a5a88 h: refs/heads/master v: v3
git-mirror · Aug 28, 2012 · c088bf9 · c088bf9
1 parent 7a4725e
commit c088bf9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);