1 files changed, 56 insertions, 46 deletions

diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c
index 49db5fa7ced3..6f19de41b878 100644
--- a/fs/btrfs/dir-item.c
+++ b/fs/btrfs/dir-item.c
@@ -33,7 +33,7 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
         int ret;
         char *ptr;
         struct btrfs_item *item;
-        struct btrfs_leaf *leaf;
+        struct extent_buffer *leaf;
 
         ret = btrfs_insert_empty_item(trans, root, path, cpu_key, data_size);
         if (ret == -EEXIST) {
@@ -49,11 +49,11 @@ static struct btrfs_dir_item *insert_with_overflow(struct btrfs_trans_handle
         if (ret < 0)
                 return ERR_PTR(ret);
         WARN_ON(ret > 0);
-        leaf = btrfs_buffer_leaf(path->nodes[0]);
-        item = leaf->items + path->slots[0];
+        leaf = path->nodes[0];
+        item = btrfs_item_nr(leaf, path->slots[0]);
         ptr = btrfs_item_ptr(leaf, path->slots[0], char);
-        BUG_ON(data_size > btrfs_item_size(item));
-        ptr += btrfs_item_size(item) - data_size;
+        BUG_ON(data_size > btrfs_item_size(leaf, item));
+        ptr += btrfs_item_size(leaf, item) - data_size;
         return (struct btrfs_dir_item *)ptr;
 }
 
@@ -65,12 +65,13 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
         int ret2 = 0;
         struct btrfs_path *path;
         struct btrfs_dir_item *dir_item;
-        char *name_ptr;
+        struct extent_buffer *leaf;
+        unsigned long name_ptr;
         struct btrfs_key key;
+        struct btrfs_disk_key disk_key;
         u32 data_size;
 
         key.objectid = dir;
-        key.flags = 0;
         btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
         ret = btrfs_name_hash(name, name_len, &key.offset);
         BUG_ON(ret);
@@ -85,14 +86,16 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
                 goto out;
         }
 
-        btrfs_cpu_key_to_disk(&dir_item->location, location);
-        btrfs_set_dir_type(dir_item, type);
-        btrfs_set_dir_flags(dir_item, 0);
-        btrfs_set_dir_name_len(dir_item, name_len);
-        name_ptr = (char *)(dir_item + 1);
+        leaf = path->nodes[0];
+        btrfs_cpu_key_to_disk(&disk_key, location);
+        btrfs_set_dir_item_key(leaf, dir_item, &disk_key);
+        btrfs_set_dir_type(leaf, dir_item, type);
+        btrfs_set_dir_flags(leaf, dir_item, 0);
+        btrfs_set_dir_name_len(leaf, dir_item, name_len);
+        name_ptr = (unsigned long)(dir_item + 1);
 
-        btrfs_memcpy(root, path->nodes[0]->b_data, name_ptr, name, name_len);
-        btrfs_mark_buffer_dirty(path->nodes[0]);
+        write_extent_buffer(leaf, name, name_ptr, name_len);
+        btrfs_mark_buffer_dirty(leaf);
 
 second_insert:
         /* FIXME, use some real flag for selecting the extra index */
@@ -110,13 +113,15 @@ second_insert:
                 ret2 = PTR_ERR(dir_item);
                 goto out;
         }
-        btrfs_cpu_key_to_disk(&dir_item->location, location);
-        btrfs_set_dir_type(dir_item, type);
-        btrfs_set_dir_flags(dir_item, 0);
-        btrfs_set_dir_name_len(dir_item, name_len);
-        name_ptr = (char *)(dir_item + 1);
-        btrfs_memcpy(root, path->nodes[0]->b_data, name_ptr, name, name_len);
-        btrfs_mark_buffer_dirty(path->nodes[0]);
+        leaf = path->nodes[0];
+        btrfs_cpu_key_to_disk(&disk_key, location);
+        btrfs_set_dir_item_key(leaf, dir_item, &disk_key);
+        btrfs_set_dir_type(leaf, dir_item, type);
+        btrfs_set_dir_flags(leaf, dir_item, 0);
+        btrfs_set_dir_name_len(leaf, dir_item, name_len);
+        name_ptr = (unsigned long)(dir_item + 1);
+        write_extent_buffer(leaf, name, name_ptr, name_len);
+        btrfs_mark_buffer_dirty(leaf);
 out:
         btrfs_free_path(path);
         if (ret)
@@ -136,14 +141,15 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
         struct btrfs_key key;
         int ins_len = mod < 0 ? -1 : 0;
         int cow = mod != 0;
-        struct btrfs_disk_key *found_key;
-        struct btrfs_leaf *leaf;
+        struct btrfs_key found_key;
+        struct extent_buffer *leaf;
 
         key.objectid = dir;
-        key.flags = 0;
         btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
+
         ret = btrfs_name_hash(name, name_len, &key.offset);
         BUG_ON(ret);
+
         ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow);
         if (ret < 0)
                 return ERR_PTR(ret);
@@ -152,12 +158,13 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,
                         return NULL;
                 path->slots[0]--;
         }
-        leaf = btrfs_buffer_leaf(path->nodes[0]);
-        found_key = &leaf->items[path->slots[0]].key;
 
-        if (btrfs_disk_key_objectid(found_key) != dir ||
-            btrfs_disk_key_type(found_key) != BTRFS_DIR_ITEM_KEY ||
-            btrfs_disk_key_offset(found_key) != key.offset)
+        leaf = path->nodes[0];
+        btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
+
+        if (found_key.objectid != dir ||
+            btrfs_key_type(&found_key) != BTRFS_DIR_ITEM_KEY ||
+            found_key.offset != key.offset)
                 return NULL;
 
         return btrfs_match_dir_item_name(root, path, name, name_len);
@@ -176,7 +183,6 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,
         int cow = mod != 0;
 
         key.objectid = dir;
-        key.flags = 0;
         btrfs_set_key_type(&key, BTRFS_DIR_INDEX_KEY);
         key.offset = objectid;
 
@@ -193,21 +199,22 @@ struct btrfs_dir_item *btrfs_match_dir_item_name(struct btrfs_root *root,
                               const char *name, int name_len)
 {
         struct btrfs_dir_item *dir_item;
-        char *name_ptr;
+        unsigned long name_ptr;
         u32 total_len;
         u32 cur = 0;
         u32 this_len;
-        struct btrfs_leaf *leaf;
+        struct extent_buffer *leaf;
 
-        leaf = btrfs_buffer_leaf(path->nodes[0]);
+        leaf = path->nodes[0];
         dir_item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dir_item);
-        total_len = btrfs_item_size(leaf->items + path->slots[0]);
+        total_len = btrfs_item_size_nr(leaf, path->slots[0]);
         while(cur < total_len) {
-                this_len = sizeof(*dir_item) + btrfs_dir_name_len(dir_item);
-                name_ptr = (char *)(dir_item + 1);
+                this_len = sizeof(*dir_item) +
+                        btrfs_dir_name_len(leaf, dir_item);
+                name_ptr = (unsigned long)(dir_item + 1);
 
-                if (btrfs_dir_name_len(dir_item) == name_len &&
-                    memcmp(name_ptr, name, name_len) == 0)
+                if (btrfs_dir_name_len(leaf, dir_item) == name_len &&
+                    memcmp_extent_buffer(leaf, name, name_ptr, name_len) == 0)
                         return dir_item;
 
                 cur += this_len;
@@ -223,20 +230,23 @@ int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,
                               struct btrfs_dir_item *di)
 {
 
-        struct btrfs_leaf *leaf;
+        struct extent_buffer *leaf;
         u32 sub_item_len;
         u32 item_len;
         int ret = 0;
 
-        leaf = btrfs_buffer_leaf(path->nodes[0]);
-        sub_item_len = sizeof(*di) + btrfs_dir_name_len(di);
-        item_len = btrfs_item_size(leaf->items + path->slots[0]);
-        if (sub_item_len == btrfs_item_size(leaf->items + path->slots[0])) {
+        leaf = path->nodes[0];
+        sub_item_len = sizeof(*di) + btrfs_dir_name_len(leaf, di);
+        item_len = btrfs_item_size_nr(leaf, path->slots[0]);
+        if (sub_item_len == item_len) {
                 ret = btrfs_del_item(trans, root, path);
         } else {
-                char *ptr = (char *)di;
-                char *start = btrfs_item_ptr(leaf, path->slots[0], char);
-                btrfs_memmove(root, leaf, ptr, ptr + sub_item_len,
+                /* MARKER */
+                unsigned long ptr = (unsigned long)di;
+                unsigned long start;
+
+                start = btrfs_item_ptr_offset(leaf, path->slots[0]);
+                memmove_extent_buffer(leaf, ptr, ptr + sub_item_len,
                         item_len - (ptr + sub_item_len - start));
                 ret = btrfs_truncate_item(trans, root, path,
                                           item_len - sub_item_len);