From 6876d6b0862d83d4b700047a16d19850167a38b5 Mon Sep 17 00:00:00 2001
From: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Date: Wed, 20 Feb 2013 14:16:14 +0000
Subject: [PATCH] --- yaml --- r: 360462 b: refs/heads/master c:
 683cebda90787730d5260eac0da7c2bff9fb40ef h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0c141def6daa..a213a507451f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa6ac8765c48a06dfed914e8c8c3a903f9d313a0
+refs/heads/master: 683cebda90787730d5260eac0da7c2bff9fb40ef
diff --git a/trunk/fs/btrfs/qgroup.c b/trunk/fs/btrfs/qgroup.c
index a0d6368249fa..88ab785bbd73 100644
--- a/trunk/fs/btrfs/qgroup.c
+++ b/trunk/fs/btrfs/qgroup.c
@@ -847,6 +847,10 @@ int btrfs_quota_disable(struct btrfs_trans_handle *trans,
 	int ret = 0;
 
 	spin_lock(&fs_info->qgroup_lock);
+	if (!fs_info->quota_root) {
+		spin_unlock(&fs_info->qgroup_lock);
+		return 0;
+	}
 	fs_info->quota_enabled = 0;
 	fs_info->pending_quota_state = 0;
 	quota_root = fs_info->quota_root;