---

yaml --- r: 360462 b: refs/heads/master c: 683cebd h: refs/heads/master v: v3
git-mirror · Feb 20, 2013 · 6876d6b · 6876d6b
1 parent 8ca6a4d
commit 6876d6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;