btrfs-progs: disable backtrace and define __always_inline

[platform/upstream/btrfs-progs.git] / root-tree.c

diff --git a/root-tree.c b/root-tree.c
index c6b13dc..934d02e 100644 (file)
--- a/root-tree.c
+++ b/root-tree.c
@@ -40,10 +40,13 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
        ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
        if (ret < 0)
                goto out;
+       if (path->slots[0] == 0) {
+               ret = -ENOENT;
+               goto out;
+       }
 
        BUG_ON(ret == 0);
        l = path->nodes[0];
-       BUG_ON(path->slots[0] == 0);
        slot = path->slots[0] - 1;
        btrfs_item_key_to_cpu(l, &found_key, slot);
        if (found_key.objectid != objectid) {
@@ -55,7 +58,6 @@ int btrfs_find_last_root(struct btrfs_root *root, u64 objectid,
        memcpy(key, &found_key, sizeof(found_key));
        ret = 0;
 out:
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        return ret;
 }
@@ -88,7 +90,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
         * for the added fields.
         */
        if (old_len < sizeof(*item)) {
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
                ret = btrfs_search_slot(trans, root, key, path,
                                -1, 1);
                if (ret < 0) {
@@ -99,7 +101,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
                if (ret < 0) {
                        goto out;
                }
-               btrfs_release_path(root, path);
+               btrfs_release_path(path);
                ret = btrfs_insert_empty_item(trans, root, path,
                                key, sizeof(*item));
                if (ret < 0) {
@@ -119,7 +121,6 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
        write_extent_buffer(l, item, ptr, sizeof(*item));
        btrfs_mark_buffer_dirty(path->nodes[0]);
 out:
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        return ret;
 }
@@ -138,33 +139,6 @@ int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root
        return ret;
 }
 
-int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
-                  struct btrfs_key *key)
-{
-       struct btrfs_path *path;
-       int ret;
-       u32 refs;
-       struct btrfs_root_item *ri;
-       struct extent_buffer *leaf;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       ret = btrfs_search_slot(trans, root, key, path, -1, 1);
-       if (ret < 0)
-               goto out;
-       BUG_ON(ret != 0);
-       leaf = path->nodes[0];
-       ri = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_item);
-
-       refs = btrfs_disk_root_refs(leaf, ri);
-       BUG_ON(refs != 0);
-       ret = btrfs_del_item(trans, root, path);
-out:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       return ret;
-}
-
 /*
  * add a btrfs_root_ref item.  type is either BTRFS_ROOT_REF_KEY
  * or BTRFS_ROOT_BACKREF_KEY.
@@ -193,6 +167,8 @@ int btrfs_add_root_ref(struct btrfs_trans_handle *trans,
 
 
        path = btrfs_alloc_path();
+       if (!path)
+               return -ENOMEM;
 
        key.objectid = root_id;
        key.type = type;