Btrfs: printk fixes

[mv-sheeva.git] / fs / btrfs / file-item.c

diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c
index 10e4cf08e9ed1843f65b82995a19a4373480fa80..d5a98827e38aca1ed219a1b2dceb2b8ade74209a 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -2,14 +2,16 @@
 #include "ctree.h"
 #include "disk-io.h"
 #include "transaction.h"
+#include "print-tree.h"
 
 #define MAX_CSUM_ITEMS(r) ((((BTRFS_LEAF_DATA_SIZE(r) - \
-                                sizeof(struct btrfs_item) * 2) / \
-                               sizeof(struct btrfs_csum_item)) - 1))
+                              sizeof(struct btrfs_item) * 2) / \
+                              BTRFS_CRC32_SIZE) - 1))
 int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root,
                               u64 objectid, u64 pos,
-                              u64 offset, u64 num_blocks)
+                              u64 offset, u64 disk_num_blocks,
+                              u64 num_blocks)
 {
        int ret = 0;
        struct btrfs_file_extent_item *item;
@@ -30,7 +32,7 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
        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, offset);
-       btrfs_set_file_extent_disk_num_blocks(item, num_blocks);
+       btrfs_set_file_extent_disk_num_blocks(item, disk_num_blocks);
        btrfs_set_file_extent_offset(item, 0);
        btrfs_set_file_extent_num_blocks(item, num_blocks);
        btrfs_set_file_extent_generation(item, trans->transid);
@@ -78,7 +80,7 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
                csum_offset = (offset - found_key.offset) >>
                                root->fs_info->sb->s_blocksize_bits;
                csums_in_item = btrfs_item_size(leaf->items + path->slots[0]);
-               csums_in_item /= sizeof(struct btrfs_csum_item);
+               csums_in_item /= BTRFS_CRC32_SIZE;
 
                if (csum_offset >= csums_in_item) {
                        ret = -EFBIG;
@@ -86,7 +88,8 @@ struct btrfs_csum_item *btrfs_lookup_csum(struct btrfs_trans_handle *trans,
                }
        }
        item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_csum_item);
-       item += csum_offset;
+       item = (struct btrfs_csum_item *)((unsigned char *)item +
+                                         csum_offset * BTRFS_CRC32_SIZE);
        return item;
 fail:
        if (ret > 0)
@@ -143,8 +146,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
                /* we found one, but it isn't big enough yet */
                leaf = btrfs_buffer_leaf(path->nodes[0]);
                item_size = btrfs_item_size(leaf->items + path->slots[0]);
-               if ((item_size / sizeof(struct btrfs_csum_item)) >=
-                   MAX_CSUM_ITEMS(root)) {
+               if ((item_size / BTRFS_CRC32_SIZE) >= MAX_CSUM_ITEMS(root)) {
                        /* already at max size, make a new one */
                        goto insert;
                }
@@ -159,7 +161,7 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
         */
        btrfs_release_path(root, path);
        ret = btrfs_search_slot(trans, root, &file_key, path,
-                               sizeof(struct btrfs_csum_item), 1);
+                               BTRFS_CRC32_SIZE, 1);
        if (ret < 0)
                goto fail;
        if (ret == 0) {
@@ -176,14 +178,14 @@ int btrfs_csum_file_block(struct btrfs_trans_handle *trans,
        if (btrfs_key_type(&found_key) != BTRFS_CSUM_ITEM_KEY ||
            found_key.objectid != objectid ||
            csum_offset >= MAX_CSUM_ITEMS(root)) {
-               WARN_ON(1);
                goto insert;
        }
        if (csum_offset >= btrfs_item_size(leaf->items + path->slots[0]) /
-           sizeof(struct btrfs_csum_item)) {
-               u32 diff = (csum_offset + 1) * sizeof(struct btrfs_csum_item);
+           BTRFS_CRC32_SIZE) {
+               u32 diff = (csum_offset + 1) * BTRFS_CRC32_SIZE;
                diff = diff - btrfs_item_size(leaf->items + path->slots[0]);
-               WARN_ON(diff != sizeof(struct btrfs_csum_item));
+               if (diff != BTRFS_CRC32_SIZE)
+                       goto insert;
                ret = btrfs_extend_item(trans, root, path, diff);
                BUG_ON(ret);
                goto csum;
@@ -193,9 +195,8 @@ insert:
        btrfs_release_path(root, path);
        csum_offset = 0;
        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
-                                     sizeof(struct btrfs_csum_item));
+                                     BTRFS_CRC32_SIZE);
        if (ret != 0) {
-               printk("at insert for %Lu %u %Lu ret is %d\n", file_key.objectid, file_key.flags, file_key.offset, ret);
                WARN_ON(1);
                goto fail;
        }
@@ -203,10 +204,13 @@ csum:
        item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]), path->slots[0],
                              struct btrfs_csum_item);
        ret = 0;
-       item += csum_offset;
+       item = (struct btrfs_csum_item *)((unsigned char *)item +
+                                         csum_offset * BTRFS_CRC32_SIZE);
 found:
-       btrfs_check_bounds(item->csum, BTRFS_CSUM_SIZE, path->nodes[0]->b_data, root->fs_info->sb->s_blocksize);
-       ret = btrfs_csum_data(root, data, len, item->csum);
+       btrfs_check_bounds(&item->csum, BTRFS_CRC32_SIZE,
+                          path->nodes[0]->b_data,
+                          root->fs_info->sb->s_blocksize);
+       ret = btrfs_csum_data(root, data, len, &item->csum);
        btrfs_mark_buffer_dirty(path->nodes[0]);
 fail:
        btrfs_release_path(root, path);
@@ -214,6 +218,32 @@ fail:
        return ret;
 }
 
+int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
+                       struct btrfs_root *root, struct btrfs_path *path,
+                       u64 isize)
+{
+       struct btrfs_key key;
+       struct btrfs_leaf *leaf = btrfs_buffer_leaf(path->nodes[0]);
+       int slot = path->slots[0];
+       int ret;
+       u32 new_item_size;
+       u64 new_item_span;
+       u64 blocks;
+
+       btrfs_disk_key_to_cpu(&key, &leaf->items[slot].key);
+       if (isize <= key.offset)
+               return 0;
+       new_item_span = isize - key.offset;
+       blocks = (new_item_span + root->blocksize - 1) >>
+               root->fs_info->sb->s_blocksize_bits;
+       new_item_size = blocks * BTRFS_CRC32_SIZE;
+       if (new_item_size >= btrfs_item_size(leaf->items + slot))
+               return 0;
+       ret = btrfs_truncate_item(trans, root, path, new_item_size);
+       BUG_ON(ret);
+       return ret;
+}
+
 int btrfs_csum_verify_file_block(struct btrfs_root *root,
                                 u64 objectid, u64 offset,
                                 char *data, size_t len)
@@ -222,7 +252,7 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
        struct btrfs_key file_key;
        struct btrfs_path *path;
        struct btrfs_csum_item *item;
-       char result[BTRFS_CSUM_SIZE];
+       char result[BTRFS_CRC32_SIZE];
 
        path = btrfs_alloc_path();
        BUG_ON(!path);
@@ -238,13 +268,13 @@ int btrfs_csum_verify_file_block(struct btrfs_root *root,
                ret = PTR_ERR(item);
                /* a csum that isn't present is a preallocated region. */
                if (ret == -ENOENT || ret == -EFBIG)
-                       ret = 1;
+                       ret = -ENOENT;
                goto fail;
        }
 
        ret = btrfs_csum_data(root, data, len, result);
        WARN_ON(ret);
-       if (memcmp(result, item->csum, BTRFS_CSUM_SIZE))
+       if (memcmp(result, &item->csum, BTRFS_CRC32_SIZE))
                ret = 1;
 fail:
        btrfs_release_path(root, path);