Btrfs-progs: just return -ENOENT if we don't find the root item
authorJosef Bacik <jbacik@fusionio.com>
Wed, 23 Oct 2013 16:18:03 +0000 (12:18 -0400)
committerChris Mason <chris.mason@fusionio.com>
Thu, 24 Oct 2013 09:57:44 +0000 (05:57 -0400)
We were bug_on(slot == 0), but that's just obnoxious, return -ENOENT so we can
handle the situation properly.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
root-tree.c

index bdc8504..858fe2f 100644 (file)
@@ -40,10 +40,11 @@ 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)
+               return -ENOENT;
 
        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) {