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 7990b574211452597df13618e54e9550b4a4905c..d5a98827e38aca1ed219a1b2dceb2b8ade74209a 100644 (file)
--- a/fs/btrfs/file-item.c
+++ b/fs/btrfs/file-item.c
@@ -2,6 +2,7 @@
 #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) / \
@@ -196,7 +197,6 @@ insert:
        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                      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;
        }
@@ -218,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)