1 files changed, 54 insertions, 21 deletions

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index fe9d02c45f8e..aee4b1cc3d98 100644
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -23,13 +23,13 @@
 #include <linux/rbtree.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/btrfs.h>
 
 #include "ctree.h"
 #include "transaction.h"
 #include "disk-io.h"
 #include "locking.h"
 #include "ulist.h"
-#include "ioctl.h"
 #include "backref.h"
 
 /* TODO XXX FIXME
@@ -379,6 +379,13 @@ next1:
 
                 ret = add_relation_rb(fs_info, found_key.objectid,
                                       found_key.offset);
+                if (ret == -ENOENT) {
+                        printk(KERN_WARNING
+                                "btrfs: orphan qgroup relation 0x%llx->0x%llx\n",
+                                (unsigned long long)found_key.objectid,
+                                (unsigned long long)found_key.offset);
+                        ret = 0;        /* ignore the error */
+                }
                 if (ret)
                         goto out;
 next2:
@@ -613,7 +620,9 @@ static int update_qgroup_limit_item(struct btrfs_trans_handle *trans,
         key.offset = qgroupid;
 
         path = btrfs_alloc_path();
-        BUG_ON(!path);
+        if (!path)
+                return -ENOMEM;
+
         ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
         if (ret > 0)
                 ret = -ENOENT;
@@ -654,7 +663,9 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans,
         key.offset = qgroup->qgroupid;
 
         path = btrfs_alloc_path();
-        BUG_ON(!path);
+        if (!path)
+                return -ENOMEM;
+
         ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
         if (ret > 0)
                 ret = -ENOENT;
@@ -695,7 +706,9 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans,
         key.offset = 0;
 
         path = btrfs_alloc_path();
-        BUG_ON(!path);
+        if (!path)
+                return -ENOMEM;
+
         ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
         if (ret > 0)
                 ret = -ENOENT;
@@ -725,33 +738,38 @@ static int btrfs_clean_quota_tree(struct btrfs_trans_handle *trans,
 {
         struct btrfs_path *path;
         struct btrfs_key key;
+        struct extent_buffer *leaf = NULL;
         int ret;
-
-        if (!root)
-                return -EINVAL;
+        int nr = 0;
 
         path = btrfs_alloc_path();
         if (!path)
                 return -ENOMEM;
 
-        while (1) {
-                key.objectid = 0;
-                key.offset = 0;
-                key.type = 0;
+        path->leave_spinning = 1;
 
-                path->leave_spinning = 1;
+        key.objectid = 0;
+        key.offset = 0;
+        key.type = 0;
+
+        while (1) {
                 ret = btrfs_search_slot(trans, root, &key, path, -1, 1);
-                if (ret > 0) {
-                        if (path->slots[0] == 0)
-                                break;
-                        path->slots[0]--;
-                } else if (ret < 0) {
+                if (ret < 0)
+                        goto out;
+                leaf = path->nodes[0];
+                nr = btrfs_header_nritems(leaf);
+                if (!nr)
                         break;
-                }
-
-                ret = btrfs_del_item(trans, root, path);
+                /*
+                 * delete the leaf one by one
+                 * since the whole tree is going
+                 * to be deleted.
+                 */
+                path->slots[0] = 0;
+                ret = btrfs_del_items(trans, root, path, 0, nr);
                 if (ret)
                         goto out;
+
                 btrfs_release_path(path);
         }
         ret = 0;
@@ -840,6 +858,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;
@@ -956,17 +978,28 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,
                         struct btrfs_fs_info *fs_info, u64 qgroupid)
 {
         struct btrfs_root *quota_root;
+        struct btrfs_qgroup *qgroup;
         int ret = 0;
 
         quota_root = fs_info->quota_root;
         if (!quota_root)
                 return -EINVAL;
 
+        /* check if there are no relations to this qgroup */
+        spin_lock(&fs_info->qgroup_lock);
+        qgroup = find_qgroup_rb(fs_info, qgroupid);
+        if (qgroup) {
+                if (!list_empty(&qgroup->groups) || !list_empty(&qgroup->members)) {
+                        spin_unlock(&fs_info->qgroup_lock);
+                        return -EBUSY;
+                }
+        }
+        spin_unlock(&fs_info->qgroup_lock);
+
         ret = del_qgroup_item(trans, quota_root, qgroupid);
 
         spin_lock(&fs_info->qgroup_lock);
         del_qgroup_rb(quota_root->fs_info, qgroupid);
-
         spin_unlock(&fs_info->qgroup_lock);
 
         return ret;