btrfs-progs: convert: Add support to rollback new convert image

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

diff --git a/root-tree.c b/root-tree.c
index bdc8504..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(path);
        btrfs_free_path(path);
        return ret;
 }
@@ -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(path);
        btrfs_free_path(path);
        return ret;
 }