]> git.karo-electronics.de Git - mv-sheeva.git/blobdiff - fs/btrfs/file-item.c
Btrfs: Fix verify_parent_transid
[mv-sheeva.git] / fs / btrfs / file-item.c
index e17cce33fe95873f01157943b5a416325dd64b94..afe42d00b5a61e341915130d25d87fbbf5d6639d 100644 (file)
                               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 disk_num_bytes,
-                              u64 num_bytes)
+                            struct btrfs_root *root,
+                            u64 objectid, u64 pos,
+                            u64 disk_offset, u64 disk_num_bytes,
+                            u64 num_bytes, u64 offset)
 {
        int ret = 0;
        struct btrfs_file_extent_item *item;
@@ -53,9 +53,9 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0],
                              struct btrfs_file_extent_item);
-       btrfs_set_file_extent_disk_bytenr(leaf, item, offset);
+       btrfs_set_file_extent_disk_bytenr(leaf, item, disk_offset);
        btrfs_set_file_extent_disk_num_bytes(leaf, item, disk_num_bytes);
-       btrfs_set_file_extent_offset(leaf, item, 0);
+       btrfs_set_file_extent_offset(leaf, item, offset);
        btrfs_set_file_extent_num_bytes(leaf, item, num_bytes);
        btrfs_set_file_extent_generation(leaf, item, trans->transid);
        btrfs_set_file_extent_type(leaf, item, BTRFS_FILE_EXTENT_REG);
@@ -134,9 +134,81 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
        return ret;
 }
 
+int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
+                      struct bio *bio)
+{
+       struct btrfs_ordered_sum *sums;
+       struct btrfs_sector_sum *sector_sum;
+       struct btrfs_ordered_extent *ordered;
+       char *data;
+       struct bio_vec *bvec = bio->bi_io_vec;
+       int bio_index = 0;
+       unsigned long total_bytes = 0;
+       unsigned long this_sum_bytes = 0;
+       u64 offset;
+
+       WARN_ON(bio->bi_vcnt <= 0);
+       sums = kzalloc(btrfs_ordered_sum_size(root, bio->bi_size), GFP_NOFS);
+       if (!sums)
+               return -ENOMEM;
+
+       sector_sum = sums->sums;
+       sums->file_offset = page_offset(bvec->bv_page) + bvec->bv_offset;
+       sums->len = bio->bi_size;
+       INIT_LIST_HEAD(&sums->list);
+       ordered = btrfs_lookup_ordered_extent(inode, sums->file_offset);
+       BUG_ON(!ordered);
+
+       while(bio_index < bio->bi_vcnt) {
+               offset = page_offset(bvec->bv_page) + bvec->bv_offset;
+               if (offset >= ordered->file_offset + ordered->len ||
+                   offset < ordered->file_offset) {
+                       unsigned long bytes_left;
+                       sums->len = this_sum_bytes;
+                       this_sum_bytes = 0;
+                       btrfs_add_ordered_sum(inode, ordered, sums);
+                       btrfs_put_ordered_extent(ordered);
+
+                       bytes_left = bio->bi_size - total_bytes;
+
+                       sums = kzalloc(btrfs_ordered_sum_size(root, bytes_left),
+                                      GFP_NOFS);
+                       BUG_ON(!sums);
+                       sector_sum = sums->sums;
+                       sums->len = bytes_left;
+                       sums->file_offset = offset;
+                       ordered = btrfs_lookup_ordered_extent(inode,
+                                                     sums->file_offset);
+                       BUG_ON(!ordered);
+               }
+
+               data = kmap_atomic(bvec->bv_page, KM_USER0);
+               sector_sum->sum = ~(u32)0;
+               sector_sum->sum = btrfs_csum_data(root,
+                                                 data + bvec->bv_offset,
+                                                 sector_sum->sum,
+                                                 bvec->bv_len);
+               kunmap_atomic(data, KM_USER0);
+               btrfs_csum_final(sector_sum->sum,
+                                (char *)&sector_sum->sum);
+               sector_sum->offset = page_offset(bvec->bv_page) +
+                       bvec->bv_offset;
+
+               sector_sum++;
+               bio_index++;
+               total_bytes += bvec->bv_len;
+               this_sum_bytes += bvec->bv_len;
+               bvec++;
+       }
+       this_sum_bytes = 0;
+       btrfs_add_ordered_sum(inode, ordered, sums);
+       btrfs_put_ordered_extent(ordered);
+       return 0;
+}
+
 int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
                           struct btrfs_root *root, struct inode *inode,
-                          struct bio *bio)
+                          struct btrfs_ordered_sum *sums)
 {
        u64 objectid = inode->i_ino;
        u64 offset;
@@ -144,18 +216,16 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
        struct btrfs_key file_key;
        struct btrfs_key found_key;
        u64 next_offset;
+       u64 total_bytes = 0;
        int found_next;
        struct btrfs_path *path;
        struct btrfs_csum_item *item;
        struct btrfs_csum_item *item_end;
        struct extent_buffer *leaf = NULL;
        u64 csum_offset;
-       u32 csum_result;
+       struct btrfs_sector_sum *sector_sum;
        u32 nritems;
        u32 ins_size;
-       int bio_index = 0;
-       struct bio_vec *bvec = bio->bi_io_vec;
-       char *data;
        char *eb_map;
        char *eb_token;
        unsigned long map_len;
@@ -163,10 +233,11 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
 
        path = btrfs_alloc_path();
        BUG_ON(!path);
+       sector_sum = sums->sums;
 again:
        next_offset = (u64)-1;
        found_next = 0;
-       offset = page_offset(bvec->bv_page) + bvec->bv_offset;
+       offset = sector_sum->offset;
        file_key.objectid = objectid;
        file_key.offset = offset;
        btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
@@ -277,55 +348,47 @@ found:
        item_end = (struct btrfs_csum_item *)((unsigned char *)item_end +
                                      btrfs_item_size_nr(leaf, path->slots[0]));
        eb_token = NULL;
-next_bvec:
-       data = kmap_atomic(bvec->bv_page, KM_IRQ0);
-       csum_result = ~(u32)0;
-       csum_result = btrfs_csum_data(root, data + bvec->bv_offset,
-                                     csum_result, bvec->bv_len);
-       kunmap_atomic(data, KM_IRQ0);
-       btrfs_csum_final(csum_result, (char *)&csum_result);
-       if (csum_result == 0) {
-               printk("csum result is 0 for inode %lu offset %Lu\n", inode->i_ino, offset);
-       }
+next_sector:
 
        if (!eb_token ||
           (unsigned long)item  + BTRFS_CRC32_SIZE >= map_start + map_len) {
                int err;
 
                if (eb_token)
-                       unmap_extent_buffer(leaf, eb_token, KM_IRQ1);
+                       unmap_extent_buffer(leaf, eb_token, KM_USER1);
                eb_token = NULL;
                err = map_private_extent_buffer(leaf, (unsigned long)item,
                                                BTRFS_CRC32_SIZE,
                                                &eb_token, &eb_map,
-                                               &map_start, &map_len, KM_IRQ1);
+                                               &map_start, &map_len, KM_USER1);
                if (err)
                        eb_token = NULL;
        }
        if (eb_token) {
                memcpy(eb_token + ((unsigned long)item & (PAGE_CACHE_SIZE - 1)),
-                      &csum_result, BTRFS_CRC32_SIZE);
+                      &sector_sum->sum, BTRFS_CRC32_SIZE);
        } else {
-               write_extent_buffer(leaf, &csum_result, (unsigned long)item,
-                                   BTRFS_CRC32_SIZE);
+               write_extent_buffer(leaf, &sector_sum->sum,
+                                   (unsigned long)item, BTRFS_CRC32_SIZE);
        }
-       bio_index++;
-       bvec++;
-       if (bio_index < bio->bi_vcnt) {
+
+       total_bytes += root->sectorsize;
+       sector_sum++;
+       if (total_bytes < sums->len) {
                item = (struct btrfs_csum_item *)((char *)item +
                                                  BTRFS_CRC32_SIZE);
                if (item < item_end && offset + PAGE_CACHE_SIZE ==
-                   page_offset(bvec->bv_page)) {
-                       offset = page_offset(bvec->bv_page);
-                       goto next_bvec;
+                   sector_sum->offset) {
+                           offset = sector_sum->offset;
+                       goto next_sector;
                }
        }
        if (eb_token) {
-               unmap_extent_buffer(leaf, eb_token, KM_IRQ1);
+               unmap_extent_buffer(leaf, eb_token, KM_USER1);
                eb_token = NULL;
        }
        btrfs_mark_buffer_dirty(path->nodes[0]);
-       if (bio_index < bio->bi_vcnt) {
+       if (total_bytes < sums->len) {
                btrfs_release_path(root, path);
                goto again;
        }