From ff71af64a0c678c8a1e0bb8e47a09a1ef2b3bd6e Mon Sep 17 00:00:00 2001
From: Miao Xie <miaox@cn.fujitsu.com>
Date: Thu, 15 Nov 2012 11:35:41 +0000
Subject: [PATCH] --- yaml --- r: 349156 b: refs/heads/master c:
 d86e56cf7d3669dd292012ac82b986bd1573b6cc h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/fs/btrfs/ioctl.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1d5fd8786d2f..9172baf02e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc975eb4605c5765a5d5e7a51d24ba5a1cda269e
+refs/heads/master: d86e56cf7d3669dd292012ac82b986bd1573b6cc
diff --git a/trunk/fs/btrfs/ioctl.c b/trunk/fs/btrfs/ioctl.c
index 7624212ae926..dd8e3448fe8f 100644
--- a/trunk/fs/btrfs/ioctl.c
+++ b/trunk/fs/btrfs/ioctl.c
@@ -3698,6 +3698,11 @@ static long btrfs_ioctl_qgroup_create(struct file *file, void __user *arg)
 		goto drop_write;
 	}
 
+	if (!sa->qgroupid) {
+		ret = -EINVAL;
+		goto out;
+	}
+
 	trans = btrfs_join_transaction(root);
 	if (IS_ERR(trans)) {
 		ret = PTR_ERR(trans);