Btrfs: rework csums and extent item ordering

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

1 files changed, 2 insertions, 24 deletions

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index f49968ad0a07..ff8f3339c684 100644
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -62,23 +62,19 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
         file_key.offset = offset;
         file_key.flags = 0;
         btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
-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) {
-printk("fail1\n");
+                if (path->slots[0] == 0)
                         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) >>
@@ -86,7 +82,6 @@ printk("fail2 type %u %Lu %Lu\n", btrfs_key_type(&found_key), found_key.objectid
                 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;
                 }
         }
@@ -109,26 +104,18 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
         struct btrfs_key file_key;
         int ins_len = mod < 0 ? -1 : 0;
         int cow = mod != 0;
-        struct btrfs_csum_item *csum_item;
 
-        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;
-        file_key.offset = btrfs_csum_extent_offset(csum_item);
+        file_key.offset = offset;
         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;
 }
 
 int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root,
                           u64 objectid, u64 offset,
-                          u64 extent_offset,
                           char *data, size_t len)
 {
         int ret;
@@ -151,10 +138,8 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
         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) {
@@ -167,15 +152,12 @@ printk("ret %d\n", ret);
         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]) /
@@ -183,13 +165,11 @@ printk("insert1\n");
                 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)
@@ -201,12 +181,10 @@ csum:
         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;
 }