Btrfs: Create extent_buffer interface for large blocksizes

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 8 insertions, 14 deletions

diff --git a/fs/btrfs/inode-item.c b/fs/btrfs/inode-item.c
index b78346177539..35d2608f8918 100644
--- a/fs/btrfs/inode-item.c
+++ b/fs/btrfs/inode-item.c
@@ -20,24 +20,18 @@
 #include "disk-io.h"
 #include "transaction.h"
 
-int btrfs_insert_inode(struct btrfs_trans_handle *trans, struct btrfs_root
-                       *root, u64 objectid, struct btrfs_inode_item
-                       *inode_item)
+int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans,
+                             struct btrfs_root *root,
+                             struct btrfs_path *path, u64 objectid)
 {
-        struct btrfs_path *path;
         struct btrfs_key key;
         int ret;
         key.objectid = objectid;
-        key.flags = 0;
         btrfs_set_key_type(&key, BTRFS_INODE_ITEM_KEY);
         key.offset = 0;
 
-        path = btrfs_alloc_path();
-        BUG_ON(!path);
-        ret = btrfs_insert_item(trans, root, &key, inode_item,
-                                sizeof(*inode_item));
-        btrfs_release_path(root, path);
-        btrfs_free_path(path);
+        ret = btrfs_insert_empty_item(trans, root, path, &key,
+                                      sizeof(struct btrfs_inode_item));
         if (ret == 0 && objectid > root->highest_inode)
                 root->highest_inode = objectid;
         return ret;
@@ -51,15 +45,15 @@ int btrfs_lookup_inode(struct btrfs_trans_handle *trans, struct btrfs_root
         int cow = mod != 0;
         int ret;
         int slot;
-        struct btrfs_leaf *leaf;
+        struct extent_buffer *leaf;
         struct btrfs_key found_key;
 
         ret = btrfs_search_slot(trans, root, location, path, ins_len, cow);
         if (ret > 0 && btrfs_key_type(location) == BTRFS_ROOT_ITEM_KEY &&
             location->offset == (u64)-1 && path->slots[0] != 0) {
                 slot = path->slots[0] - 1;
-                leaf = btrfs_buffer_leaf(path->nodes[0]);
-                btrfs_disk_key_to_cpu(&found_key, &leaf->items[slot].key);
+                leaf = path->nodes[0];
+                btrfs_item_key_to_cpu(leaf, &found_key, slot);
                 if (found_key.objectid == location->objectid &&
                     btrfs_key_type(&found_key) == btrfs_key_type(location)) {
                         path->slots[0]--;