drm/radeon: fix PM on non-vram cards.

[safe/jmp/linux-2.6] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 58930fc..c56eb59 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -16,7 +16,6 @@
  * Boston, MA 021110-1307, USA.
  */
 
-#include <linux/module.h>
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
@@ -25,14 +24,16 @@ int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
 {
        struct btrfs_path *path;
        int ret;
-       struct btrfs_leaf *l;
+       struct extent_buffer *l;
        struct btrfs_key search_key;
+       struct btrfs_key found_key;
        int slot;
 
        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)
@@ -40,10 +41,12 @@ int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
        BUG_ON(ret == 0);
        if (path->slots[0] > 0) {
                slot = path->slots[0] - 1;
-               l = btrfs_buffer_leaf(path->nodes[0]);
-               *objectid = btrfs_disk_key_objectid(&l->items[slot].key);
+               l = path->nodes[0];
+               btrfs_item_key_to_cpu(l, &found_key, slot);
+               *objectid = max_t(u64, found_key.objectid,
+                                 BTRFS_FIRST_FREE_OBJECTID - 1);
        } else {
-               *objectid = BTRFS_FIRST_FREE_OBJECTID;
+               *objectid = BTRFS_FIRST_FREE_OBJECTID - 1;
        }
        ret = 0;
 error:
@@ -51,84 +54,27 @@ error:
        return ret;
 }
 
-/*
- * walks the btree of allocated inodes and find a hole.
- */
 int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root,
                             u64 dirid, u64 *objectid)
 {
-       struct btrfs_path *path;
-       struct btrfs_key key;
        int ret;
-       u64 hole_size = 0;
-       int slot = 0;
-       u64 last_ino = 0;
-       int start_found;
-       struct btrfs_leaf *l;
-       struct btrfs_key search_key;
-       u64 search_start = dirid;
-
-       path = btrfs_alloc_path();
-       BUG_ON(!path);
-       search_key.flags = 0;
-       search_start = root->last_inode_alloc;
-       search_start = max(search_start, BTRFS_FIRST_FREE_OBJECTID);
-       search_key.objectid = search_start;
-       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)
-               goto error;
+       mutex_lock(&root->objectid_mutex);
 
-       if (path->slots[0] > 0)
-               path->slots[0]--;
+       if (unlikely(root->highest_objectid < BTRFS_FIRST_FREE_OBJECTID)) {
+               ret = btrfs_find_highest_inode(root, &root->highest_objectid);
+               if (ret)
+                       goto out;
+       }
 
-       while (1) {
-               l = btrfs_buffer_leaf(path->nodes[0]);
-               slot = path->slots[0];
-               if (slot >= btrfs_header_nritems(&l->header)) {
-                       ret = btrfs_next_leaf(root, path);
-                       if (ret == 0)
-                               continue;
-                       if (ret < 0)
-                               goto error;
-                       if (!start_found) {
-                               *objectid = search_start;
-                               start_found = 1;
-                               goto found;
-                       }
-                       *objectid = last_ino > search_start ?
-                               last_ino : search_start;
-                       goto found;
-               }
-               btrfs_disk_key_to_cpu(&key, &l->items[slot].key);
-               if (key.objectid >= search_start) {
-                       if (start_found) {
-                               if (last_ino < search_start)
-                                       last_ino = search_start;
-                               hole_size = key.objectid - last_ino;
-                               if (hole_size > 0) {
-                                       *objectid = last_ino;
-                                       goto found;
-                               }
-                       }
-               }
-               start_found = 1;
-               last_ino = key.objectid + 1;
-               path->slots[0]++;
+       if (unlikely(root->highest_objectid >= BTRFS_LAST_FREE_OBJECTID)) {
+               ret = -ENOSPC;
+               goto out;
        }
-       // FIXME -ENOSPC
-found:
-       root->last_inode_alloc = *objectid;
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
-       BUG_ON(*objectid < search_start);
-       return 0;
-error:
-       btrfs_release_path(root, path);
-       btrfs_free_path(path);
+
+       *objectid = ++root->highest_objectid;
+       ret = 0;
+out:
+       mutex_unlock(&root->objectid_mutex);
        return ret;
 }