Btrfs: Fix starting search offset inside btrfs_drop_extents
[cascardo/linux.git] / fs / btrfs / file-item.c
index 45127e4..f763788 100644 (file)
@@ -31,7 +31,8 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
                             struct btrfs_root *root,
                             u64 objectid, u64 pos,
                             u64 disk_offset, u64 disk_num_bytes,
-                            u64 num_bytes, u64 offset)
+                            u64 num_bytes, u64 offset, u64 ram_bytes,
+                            u8 compression, u8 encryption, u16 other_encoding)
 {
        int ret = 0;
        struct btrfs_file_extent_item *item;
@@ -57,8 +58,13 @@ int btrfs_insert_file_extent(struct btrfs_trans_handle *trans,
        btrfs_set_file_extent_disk_num_bytes(leaf, item, disk_num_bytes);
        btrfs_set_file_extent_offset(leaf, item, offset);
        btrfs_set_file_extent_num_bytes(leaf, item, num_bytes);
+       btrfs_set_file_extent_ram_bytes(leaf, item, ram_bytes);
        btrfs_set_file_extent_generation(leaf, item, trans->transid);
        btrfs_set_file_extent_type(leaf, item, BTRFS_FILE_EXTENT_REG);
+       btrfs_set_file_extent_compression(leaf, item, compression);
+       btrfs_set_file_extent_encryption(leaf, item, encryption);
+       btrfs_set_file_extent_other_encoding(leaf, item, other_encoding);
+
        btrfs_mark_buffer_dirty(leaf);
 out:
        btrfs_free_path(path);
@@ -134,6 +140,153 @@ int btrfs_lookup_file_extent(struct btrfs_trans_handle *trans,
        return ret;
 }
 
+int btrfs_lookup_bio_sums(struct btrfs_root *root, struct inode *inode,
+                         struct bio *bio)
+{
+       u32 sum;
+       struct bio_vec *bvec = bio->bi_io_vec;
+       int bio_index = 0;
+       u64 offset;
+       u64 item_start_offset = 0;
+       u64 item_last_offset = 0;
+       u32 diff;
+       int ret;
+       struct btrfs_path *path;
+       struct btrfs_csum_item *item = NULL;
+       struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;
+
+       path = btrfs_alloc_path();
+       if (bio->bi_size > PAGE_CACHE_SIZE * 8)
+               path->reada = 2;
+
+       WARN_ON(bio->bi_vcnt <= 0);
+
+       while(bio_index < bio->bi_vcnt) {
+               offset = page_offset(bvec->bv_page) + bvec->bv_offset;
+               ret = btrfs_find_ordered_sum(inode, offset, &sum);
+               if (ret == 0)
+                       goto found;
+
+               if (!item || offset < item_start_offset ||
+                   offset >= item_last_offset) {
+                       struct btrfs_key found_key;
+                       u32 item_size;
+
+                       if (item)
+                               btrfs_release_path(root, path);
+                       item = btrfs_lookup_csum(NULL, root, path,
+                                                inode->i_ino, offset, 0);
+                       if (IS_ERR(item)) {
+                               ret = PTR_ERR(item);
+                               if (ret == -ENOENT || ret == -EFBIG)
+                                       ret = 0;
+                               sum = 0;
+                               printk("no csum found for inode %lu start "
+                                      "%llu\n", inode->i_ino,
+                                      (unsigned long long)offset);
+                               item = NULL;
+                               btrfs_release_path(root, path);
+                               goto found;
+                       }
+                       btrfs_item_key_to_cpu(path->nodes[0], &found_key,
+                                             path->slots[0]);
+
+                       item_start_offset = found_key.offset;
+                       item_size = btrfs_item_size_nr(path->nodes[0],
+                                                      path->slots[0]);
+                       item_last_offset = item_start_offset +
+                               (item_size / BTRFS_CRC32_SIZE) *
+                               root->sectorsize;
+                       item = btrfs_item_ptr(path->nodes[0], path->slots[0],
+                                             struct btrfs_csum_item);
+               }
+               /*
+                * this byte range must be able to fit inside
+                * a single leaf so it will also fit inside a u32
+                */
+               diff = offset - item_start_offset;
+               diff = diff / root->sectorsize;
+               diff = diff * BTRFS_CRC32_SIZE;
+
+               read_extent_buffer(path->nodes[0], &sum,
+                                  ((unsigned long)item) + diff,
+                                  BTRFS_CRC32_SIZE);
+found:
+               set_state_private(io_tree, offset, sum);
+               bio_index++;
+               bvec++;
+       }
+       btrfs_free_path(path);
+       return 0;
+}
+
+int btrfs_csum_file_bytes(struct btrfs_root *root, struct inode *inode,
+                         u64 start, unsigned long len)
+{
+       struct btrfs_ordered_sum *sums;
+       struct btrfs_sector_sum *sector_sum;
+       struct btrfs_ordered_extent *ordered;
+       char *data;
+       struct page *page;
+       unsigned long total_bytes = 0;
+       unsigned long this_sum_bytes = 0;
+
+       sums = kzalloc(btrfs_ordered_sum_size(root, len), GFP_NOFS);
+       if (!sums)
+               return -ENOMEM;
+
+       sector_sum = sums->sums;
+       sums->file_offset = start;
+       sums->len = len;
+       INIT_LIST_HEAD(&sums->list);
+       ordered = btrfs_lookup_ordered_extent(inode, sums->file_offset);
+       BUG_ON(!ordered);
+
+       while(len > 0) {
+               if (start >= ordered->file_offset + ordered->len ||
+                   start < ordered->file_offset) {
+                       sums->len = this_sum_bytes;
+                       this_sum_bytes = 0;
+                       btrfs_add_ordered_sum(inode, ordered, sums);
+                       btrfs_put_ordered_extent(ordered);
+
+                       sums = kzalloc(btrfs_ordered_sum_size(root, len),
+                                      GFP_NOFS);
+                       BUG_ON(!sums);
+                       sector_sum = sums->sums;
+                       sums->len = len;
+                       sums->file_offset = start;
+                       ordered = btrfs_lookup_ordered_extent(inode,
+                                                     sums->file_offset);
+                       BUG_ON(!ordered);
+               }
+
+               page = find_get_page(inode->i_mapping,
+                                    start >> PAGE_CACHE_SHIFT);
+
+               data = kmap_atomic(page, KM_USER0);
+               sector_sum->sum = ~(u32)0;
+               sector_sum->sum = btrfs_csum_data(root, data, sector_sum->sum,
+                                                 PAGE_CACHE_SIZE);
+               kunmap_atomic(data, KM_USER0);
+               btrfs_csum_final(sector_sum->sum,
+                                (char *)&sector_sum->sum);
+               sector_sum->offset = page_offset(page);
+               page_cache_release(page);
+
+               sector_sum++;
+               total_bytes += PAGE_CACHE_SIZE;
+               this_sum_bytes += PAGE_CACHE_SIZE;
+               start += PAGE_CACHE_SIZE;
+
+               WARN_ON(len < PAGE_CACHE_SIZE);
+               len -= PAGE_CACHE_SIZE;
+       }
+       btrfs_add_ordered_sum(inode, ordered, sums);
+       btrfs_put_ordered_extent(ordered);
+       return 0;
+}
+
 int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
                       struct bio *bio)
 {
@@ -152,7 +305,7 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
        if (!sums)
                return -ENOMEM;
 
-       sector_sum = &sums->sums;
+       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);
@@ -174,7 +327,7 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
                        sums = kzalloc(btrfs_ordered_sum_size(root, bytes_left),
                                       GFP_NOFS);
                        BUG_ON(!sums);
-                       sector_sum = &sums->sums;
+                       sector_sum = sums->sums;
                        sums->len = bytes_left;
                        sums->file_offset = offset;
                        ordered = btrfs_lookup_ordered_extent(inode,
@@ -193,12 +346,14 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
                                 (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;
@@ -231,7 +386,7 @@ int btrfs_csum_file_blocks(struct btrfs_trans_handle *trans,
 
        path = btrfs_alloc_path();
        BUG_ON(!path);
-       sector_sum = &sums->sums;
+       sector_sum = sums->sums;
 again:
        next_offset = (u64)-1;
        found_next = 0;
@@ -240,9 +395,11 @@ again:
        file_key.offset = offset;
        btrfs_set_key_type(&file_key, BTRFS_CSUM_ITEM_KEY);
 
+       mutex_lock(&BTRFS_I(inode)->csum_mutex);
        item = btrfs_lookup_csum(trans, root, path, objectid, offset, 1);
        if (!IS_ERR(item)) {
                leaf = path->nodes[0];
+               ret = 0;
                goto found;
        }
        ret = PTR_ERR(item);
@@ -286,7 +443,7 @@ again:
        ret = btrfs_search_slot(trans, root, &file_key, path,
                                BTRFS_CRC32_SIZE, 1);
        if (ret < 0)
-               goto fail;
+               goto fail_unlock;
        if (ret == 0) {
                BUG();
        }
@@ -330,10 +487,10 @@ insert:
        ret = btrfs_insert_empty_item(trans, root, path, &file_key,
                                      ins_size);
        if (ret < 0)
-               goto fail;
+               goto fail_unlock;
        if (ret != 0) {
                WARN_ON(1);
-               goto fail;
+               goto fail_unlock;
        }
 csum:
        leaf = path->nodes[0];
@@ -346,6 +503,8 @@ found:
        item_end = (struct btrfs_csum_item *)((unsigned char *)item_end +
                                      btrfs_item_size_nr(leaf, path->slots[0]));
        eb_token = NULL;
+       mutex_unlock(&BTRFS_I(inode)->csum_mutex);
+       cond_resched();
 next_sector:
 
        if (!eb_token ||
@@ -386,13 +545,18 @@ next_sector:
                eb_token = NULL;
        }
        btrfs_mark_buffer_dirty(path->nodes[0]);
+       cond_resched();
        if (total_bytes < sums->len) {
                btrfs_release_path(root, path);
                goto again;
        }
-fail:
+out:
        btrfs_free_path(path);
        return ret;
+
+fail_unlock:
+       mutex_unlock(&BTRFS_I(inode)->csum_mutex);
+       goto out;
 }
 
 int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
@@ -420,4 +584,3 @@ int btrfs_csum_truncate(struct btrfs_trans_handle *trans,
        BUG_ON(ret);
        return ret;
 }
-