Merge commit 'v2.6.29-rc7' into next

[mv-sheeva.git] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index cd6171c2da4296fe213a07491ff6c1f20ec0220d..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)
@@ -117,15 +116,18 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
                                        *objectid = last_ino;
                                        goto found;
                                }
+                       } else if (key.objectid > search_start) {
+                               *objectid = search_start;
+                               goto found;
                        }
                }
                if (key.objectid >= BTRFS_LAST_FREE_OBJECTID)
                        break;
+
                start_found = 1;
                last_ino = key.objectid + 1;
                path->slots[0]++;
        }
-       // FIXME -ENOSPC
        BUG_ON(1);
 found:
        btrfs_release_path(root, path);