summaryrefslogtreecommitdiff
path: root/fs/btrfs/inode-map.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-04-10 20:13:09 +0400
committerDavid Woodhouse <dwmw2@hera.kernel.org>2007-04-10 20:13:09 +0400
commit1b05da2ee6217e7d55460d04335813fec25be4ca (patch)
tree250a3e789777c7a6d17dccf0bf5a57b00ef1bdac /fs/btrfs/inode-map.c
parentc5739bba5260a59cebd20a51a55080592c8d3b07 (diff)
downloadlinux-1b05da2ee6217e7d55460d04335813fec25be4ca.tar.xz
Btrfs: drop the inode map tree
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/inode-map.c')
-rw-r--r--fs/btrfs/inode-map.c65
1 files changed, 4 insertions, 61 deletions
diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index f665221409ac..318e27a6378b 100644
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -3,12 +3,11 @@
#include "disk-io.h"
#include "transaction.h"
-int btrfs_find_highest_inode(struct btrfs_root *fs_root, u64 *objectid)
+int btrfs_find_highest_inode(struct btrfs_root *root, u64 *objectid)
{
struct btrfs_path *path;
int ret;
struct btrfs_leaf *l;
- struct btrfs_root *root = fs_root->fs_info->inode_root;
struct btrfs_key search_key;
int slot;
@@ -38,7 +37,7 @@ error:
* walks the btree of allocated inodes and find a hole.
*/
int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
- struct btrfs_root *fs_root,
+ struct btrfs_root *root,
u64 dirid, u64 *objectid)
{
struct btrfs_path *path;
@@ -49,16 +48,13 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
u64 last_ino = 0;
int start_found;
struct btrfs_leaf *l;
- struct btrfs_root *root = fs_root->fs_info->inode_root;
struct btrfs_key search_key;
u64 search_start = dirid;
path = btrfs_alloc_path();
BUG_ON(!path);
search_key.flags = 0;
- btrfs_set_key_type(&search_key, BTRFS_INODE_MAP_ITEM_KEY);
-
- search_start = fs_root->fs_info->last_inode_alloc;
+ search_start = root->last_inode_alloc;
search_start = max(search_start, BTRFS_FIRST_FREE_OBJECTID);
search_key.objectid = search_start;
search_key.offset = 0;
@@ -108,7 +104,7 @@ int btrfs_find_free_objectid(struct btrfs_trans_handle *trans,
}
// FIXME -ENOSPC
found:
- root->fs_info->last_inode_alloc = *objectid;
+ root->last_inode_alloc = *objectid;
btrfs_release_path(root, path);
btrfs_free_path(path);
BUG_ON(*objectid < search_start);
@@ -118,56 +114,3 @@ error:
btrfs_free_path(path);
return ret;
}
-
-int btrfs_insert_inode_map(struct btrfs_trans_handle *trans,
- struct btrfs_root *fs_root,
- u64 objectid, struct btrfs_key *location)
-{
- int ret = 0;
- struct btrfs_path *path;
- struct btrfs_inode_map_item *inode_item;
- struct btrfs_key key;
- struct btrfs_root *inode_root = fs_root->fs_info->inode_root;
-
- key.objectid = objectid;
- key.flags = 0;
- btrfs_set_key_type(&key, BTRFS_INODE_MAP_ITEM_KEY);
- key.offset = 0;
- path = btrfs_alloc_path();
- BUG_ON(!path);
- btrfs_init_path(path);
- ret = btrfs_insert_empty_item(trans, inode_root, path, &key,
- sizeof(struct btrfs_inode_map_item));
- if (ret)
- goto out;
-
- inode_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
- path->slots[0], struct btrfs_inode_map_item);
- btrfs_cpu_key_to_disk(&inode_item->key, location);
- btrfs_mark_buffer_dirty(path->nodes[0]);
- if (objectid > fs_root->fs_info->highest_inode)
- fs_root->fs_info->highest_inode = objectid;
-out:
- btrfs_release_path(inode_root, path);
- btrfs_free_path(path);
- return ret;
-}
-
-int btrfs_lookup_inode_map(struct btrfs_trans_handle *trans,
- struct btrfs_root *fs_root, struct btrfs_path *path,
- u64 objectid, int mod)
-{
- int ret;
- struct btrfs_key key;
- int ins_len = mod < 0 ? -1 : 0;
- int cow = mod != 0;
- struct btrfs_root *inode_root = fs_root->fs_info->inode_root;
-
- key.objectid = objectid;
- key.flags = 0;
- key.offset = 0;
- btrfs_set_key_type(&key, BTRFS_INODE_MAP_ITEM_KEY);
- ret = btrfs_search_slot(trans, inode_root, &key, path, ins_len, cow);
- return ret;
-}
-