Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[linux-2.6-omap-h63xx.git] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 80038c5ef7cf8678fc6d70f172fee2129eb0d4f7..cc7334d833c9d27f4a139b6b96232e959f1458a5 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -84,7 +84,6 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        search_key.type = 0;
        search_key.offset = 0;
 
-       btrfs_init_path(path);
        start_found = 0;
        ret = btrfs_search_slot(trans, root, &search_key, path, 0, 0);
        if (ret < 0)
@@ -129,7 +128,6 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
                last_ino = key.objectid + 1;
                path->slots[0]++;
        }
-       // FIXME -ENOSPC
        BUG_ON(1);
 found:
        btrfs_release_path(root, path);