Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

[~andy/linux] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index ab74977adf5c8e219b56b9e4da1490b0c5b08125..2aa79873eb46a46baa00503d6682de1861db7c45 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -32,7 +32,8 @@ int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
        path = btrfs_alloc_path();
        BUG_ON(!path);
 
-       search_key.objectid = (u64)-1;
+       search_key.objectid = BTRFS_LAST_FREE_OBJECTID;
+       search_key.type = -1;
        search_key.offset = (u64)-1;
        ret = btrfs_search_slot(NULL, root, &search_key, path, 0, 0);
        if (ret < 0)
@@ -62,7 +63,6 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        struct btrfs_path *path;
        struct btrfs_key key;
        int ret;
-       u64 hole_size = 0;
        int slot = 0;
        u64 last_ino = 0;
        int start_found;
@@ -70,11 +70,18 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        struct btrfs_key search_key;
        u64 search_start = dirid;
 
+       mutex_lock(&root->objectid_mutex);
+       if (root->last_inode_alloc >= BTRFS_FIRST_FREE_OBJECTID &&
+           root->last_inode_alloc < BTRFS_LAST_FREE_OBJECTID) {
+               *objectid = ++root->last_inode_alloc;
+               mutex_unlock(&root->objectid_mutex);
+               return 0;
+       }
        path = btrfs_alloc_path();
        BUG_ON(!path);
-       search_start = root->last_inode_alloc;
        search_start = max(search_start, BTRFS_FIRST_FREE_OBJECTID);
        search_key.objectid = search_start;
+       search_key.type = 0;
        search_key.offset = 0;
 
        btrfs_init_path(path);
@@ -83,9 +90,6 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
        if (ret < 0)
                goto error;
 
-       if (path->slots[0] > 0)
-               path->slots[0]--;
-
        while (1) {
                l = path->nodes[0];
                slot = path->slots[0];
@@ -109,26 +113,32 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
                        if (start_found) {
                                if (last_ino < search_start)
                                        last_ino = search_start;
-                               hole_size = key.objectid - last_ino;
-                               if (hole_size > 0) {
+                               if (key.objectid > last_ino) {
                                        *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:
-       root->last_inode_alloc = *objectid;
        btrfs_release_path(root, path);
        btrfs_free_path(path);
        BUG_ON(*objectid < search_start);
+       mutex_unlock(&root->objectid_mutex);
        return 0;
 error:
        btrfs_release_path(root, path);
        btrfs_free_path(path);
+       mutex_unlock(&root->objectid_mutex);
        return ret;
 }