1 files changed, 41 insertions, 20 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 93d42d650820..f49968ad0a07 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -6,13 +6,11 @@
 #define MAX_CSUM_ITEMS(r) ((((BTRFS_LEAF_DATA_SIZE(r) - \
                                  sizeof(struct btrfs_item)) / \
                                 sizeof(struct btrfs_csum_item)) - 1))
-int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
+int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root,
-                               u64 objectid, u64 offset,
-                               u64 num_blocks, u64 hint_block,
-                               u64 *result)
+                               u64 objectid, u64 pos,
+                               u64 offset, u64 num_blocks)
 {
-        struct btrfs_key ins;
         int ret = 0;
         struct btrfs_file_extent_item *item;
         struct btrfs_key file_key;
@@ -21,11 +19,13 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
         path = btrfs_alloc_path();
         BUG_ON(!path);
         btrfs_init_path(path);
+        /*
         ret = btrfs_alloc_extent(trans, root, num_blocks, hint_block,
                                  (u64)-1, &ins);
+                                 */
         BUG_ON(ret);
         file_key.objectid = objectid;
-        file_key.offset = offset;
+        file_key.offset = pos;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
 
@@ -34,21 +34,22 @@ int btrfs_alloc_file_extent(struct btrfs_trans_handle *trans,
         BUG_ON(ret);
         item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                               struct btrfs_file_extent_item);
-        btrfs_set_file_extent_disk_blocknr(item, ins.objectid);
-        btrfs_set_file_extent_disk_num_blocks(item, ins.offset);
+        btrfs_set_file_extent_disk_blocknr(item, offset);
+        btrfs_set_file_extent_disk_num_blocks(item, num_blocks);
         btrfs_set_file_extent_offset(item, 0);
-        btrfs_set_file_extent_num_blocks(item, ins.offset);
+        btrfs_set_file_extent_num_blocks(item, num_blocks);
         btrfs_set_file_extent_generation(item, trans->transid);
         btrfs_mark_buffer_dirty(path->nodes[0]);
-        *result = ins.objectid;
         btrfs_release_path(root, path);
         btrfs_free_path(path);
         return 0;
 }
 
-static struct btrfs_csum_item *__lookup_csum_item(struct btrfs_root *root,
-                                                  struct btrfs_path *path,
-                                                  u64 objectid, u64 offset)
+struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
+                                          struct btrfs_root *root,
+                                          struct btrfs_path *path,
+                                          u64 objectid, u64 offset,
+                                          int cow)
 {
         int ret;
         struct btrfs_key file_key;
@@ -61,19 +62,23 @@ static struct btrfs_csum_item *__lookup_csum_item(struct btrfs_root *root,
         file_key.offset = offset;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
-        ret = btrfs_search_slot(NULL, root, &file_key, path, 0, 0);
+printk("__lookup for %Lu\n", offset);
+        ret = btrfs_search_slot(trans, root, &file_key, path, 0, cow);
         if (ret < 0)
                 goto fail;
         leaf = btrfs_buffer_leaf(path->nodes[0]);
         if (ret > 0) {
                 ret = 1;
-                if (path->slots[0] == 0)
+                if (path->slots[0] == 0) {
+printk("fail1\n");
                         goto fail;
+                }
                 path->slots[0]--;
                 btrfs_disk_key_to_cpu(&found_key,
                                       &leaf->items[path->slots[0]].key);
                 if (btrfs_key_type(&found_key) != BTRFS_CSUM_ITEM_KEY ||
                     found_key.objectid != objectid) {
+printk("fail2 type %u %Lu %Lu\n", btrfs_key_type(&found_key), found_key.objectid, objectid);
                         goto fail;
                 }
                 csum_offset = (offset - found_key.offset) >>
@@ -81,6 +86,7 @@ static struct btrfs_csum_item *__lookup_csum_item(struct btrfs_root *root,
                 if (csum_offset >=
                     btrfs_item_size(leaf->items + path->slots[0]) /
                     sizeof(struct btrfs_csum_item)) {
+printk("fail3, csum offset %lu size %u\n", csum_offset, btrfs_item_size(leaf->items + path->slots[0]) / sizeof(struct btrfs_csum_item));
                         goto fail;
                 }
         }
@@ -89,7 +95,7 @@ static struct btrfs_csum_item *__lookup_csum_item(struct btrfs_root *root,
         return item;
 fail:
         if (ret > 0)
-                ret = -EIO;
+                ret = -ENOENT;
         return ERR_PTR(ret);
 }
 
@@ -105,7 +111,7 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
         int cow = mod != 0;
         struct btrfs_csum_item *csum_item;
 
-        csum_item = __lookup_csum_item(root, path, objectid, offset);
+        csum_item = btrfs_lookup_csum(trans, root, path, objectid, offset, 0);
         if (IS_ERR(csum_item))
                 return PTR_ERR(csum_item);
         file_key.objectid = objectid;
@@ -113,7 +119,9 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_EXTENT_DATA_KEY);
         btrfs_release_path(root, path);
+printk("lookup file extent searches for %Lu\n", file_key.offset);
         ret = btrfs_search_slot(trans, root, &file_key, path, ins_len, cow);
+printk("ret is %d\n", ret);
         return ret;
 }
 
@@ -134,17 +142,23 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
         path = btrfs_alloc_path();
         BUG_ON(!path);
         btrfs_init_path(path);
+
+        item = btrfs_lookup_csum(trans, root, path, objectid, offset, 0);
+        if (!IS_ERR(item))
+                goto found;
+        btrfs_release_path(root, path);
         file_key.objectid = objectid;
         file_key.offset = offset;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
+printk("searching for csum %Lu %Lu\n", objectid, offset);
         ret = btrfs_search_slot(trans, root, &file_key, path,
                                 sizeof(struct btrfs_csum_item), 1);
+printk("ret %d\n", ret);
         if (ret < 0)
                 goto fail;
         if (ret == 0) {
-                csum_offset = 0;
-                goto csum;
+                BUG();
         }
         if (path->slots[0] == 0) {
                 btrfs_release_path(root, path);
@@ -153,12 +167,15 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
         path->slots[0]--;
         leaf = btrfs_buffer_leaf(path->nodes[0]);
         btrfs_disk_key_to_cpu(&found_key, &leaf->items[path->slots[0]].key);
+printk("found key %Lu %Lu %u\n", found_key.objectid, found_key.offset, found_key.flags);
         csum_offset = (offset - found_key.offset) >>
                         root->fs_info->sb->s_blocksize_bits;
+printk("csum_offset %Lu\n", csum_offset);
         if (btrfs_key_type(&found_key) != BTRFS_CSUM_ITEM_KEY ||
             found_key.objectid != objectid ||
             csum_offset >= MAX_CSUM_ITEMS(root)) {
                 btrfs_release_path(root, path);
+printk("insert1\n");
                 goto insert;
         }
         if (csum_offset >= btrfs_item_size(leaf->items + path->slots[0]) /
@@ -166,11 +183,13 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
                 ret = btrfs_extend_item(trans, root, path,
                                         sizeof(struct btrfs_csum_item));
                 BUG_ON(ret);
+printk("item extended\n");
                 goto csum;
         }
 
 insert:
         csum_offset = 0;
+printk("inserting item %Lu %Lu %u\n", file_key.objectid, file_key.offset, file_key.flags);
         ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                       sizeof(struct btrfs_csum_item));
         if (ret != 0 && ret != -EEXIST)
@@ -180,12 +199,14 @@ csum:
                               struct btrfs_csum_item);
         ret = 0;
         item += csum_offset;
+found:
         ret = btrfs_csum_data(root, data, len, item->csum);
         btrfs_set_csum_extent_offset(item, extent_offset);
         btrfs_mark_buffer_dirty(path->nodes[0]);
 fail:
         btrfs_release_path(root, path);
         btrfs_free_path(path);
+printk("return ret %d\n", ret);
         return ret;
 }
 
@@ -208,7 +229,7 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
         mutex_lock(&root->fs_info->fs_mutex);
 
-        item = __lookup_csum_item(root, path, objectid, offset);
+        item = btrfs_lookup_csum(NULL, root, path, objectid, offset, 0);
         if (IS_ERR(item)) {
                 ret = PTR_ERR(item);
                 goto fail;