Btrfs progs v4.16

[platform/upstream/btrfs-progs.git] / inode-map.c

diff --git a/inode-map.c b/inode-map.c
index d2970d4..9000e69 100644 (file)
--- a/inode-map.c
+++ b/inode-map.c
@@ -19,38 +19,7 @@
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
-
-int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
-{
-       struct btrfs_path *path;
-       int ret;
-       struct extent_buffer *l;
-       struct btrfs_key search_key;
-       struct btrfs_key found_key;
-       int slot;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-
-       search_key.objectid = (u64)-1;
-       search_key.offset = (u64)-1;
-       ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
-       if (ret < 0)
-               goto error;
-       BUG_ON(ret == 0);
-       if (path->slots[0] > 0) {
-               slot = path->slots[0] - 1;
-               l = path->nodes[0];
-               btrfs_item_key_to_cpu(l, &found_key, slot);
-               *objectid = found_key.objectid;
-       } else {
-               *objectid = BTRFS_FIRST_FREE_OBJECTID;
-       }
-       ret = 0;
-error:
-       btrfs_free_path(path);
-       return ret;
-}
+#include "internal.h"
 
 /*
  * walks the btree of allocated inodes and find a hole.
@@ -70,12 +39,15 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        u64 search_start = dirid;
 
        path = btrfs_alloc_path();
-       BUG_ON(!path);
+       if (!path)
+               return -ENOMEM;
+
        search_start = root->last_inode_alloc;
        search_start = max((unsigned long long)search_start,
                                BTRFS_FIRST_FREE_OBJECTID);
        search_key.objectid = search_start;
        search_key.offset = 0;
+       search_key.type = 0;
 
        btrfs_init_path(path);
        start_found = 0;
@@ -122,12 +94,10 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        // FIXME -ENOSPC
 found:
        root->last_inode_alloc = *objectid;
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        BUG_ON(*objectid < search_start);
        return 0;
 error:
-       btrfs_release_path(root, path);
        btrfs_free_path(path);
        return ret;
 }