diff options
| author | Yan Zheng | 2008-11-10 13:34:43 +0100 |
|---|---|---|
| committer | Chris Mason | 2008-11-10 13:34:43 +0100 |
| commit | ff5b7ee33d82414bf4baf299c21fb703bcc89629 (patch) | |
| tree | 926786cf57b375e5ef1f865427c910c3d4bdfc7a /fs/btrfs/inode.c | |
| parent | Btrfs: Make sure pages are dirty before doing delalloc for them (diff) | |
| download | kernel-qcow2-linux-ff5b7ee33d82414bf4baf299c21fb703bcc89629.tar.gz kernel-qcow2-linux-ff5b7ee33d82414bf4baf299c21fb703bcc89629.tar.xz kernel-qcow2-linux-ff5b7ee33d82414bf4baf299c21fb703bcc89629.zip | |
Btrfs: Fix csum error for compressed data
The decompress code doesn't take the logical offset in extent
pointer into account. If the logical offset isn't zero, data
will be decompressed into wrong pages.
The solution used here is to record the starting offset of the extent
in the file separately from the logical start of the extent_map struct.
This allows us to avoid problems inserting overlapping extents.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index e01c0d0310ab..59660293d291 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -3949,6 +3949,8 @@ again: found_type == BTRFS_FILE_EXTENT_PREALLOC) { em->start = extent_start; em->len = extent_end - extent_start; + em->orig_start = extent_start - + btrfs_file_extent_offset(leaf, item); bytenr = btrfs_file_extent_disk_bytenr(leaf, item); if (bytenr == 0) { em->block_start = EXTENT_MAP_HOLE; @@ -3988,6 +3990,7 @@ again: em->start = extent_start + extent_offset; em->len = (copy_size + root->sectorsize - 1) & ~((u64)root->sectorsize - 1); + em->orig_start = EXTENT_MAP_INLINE; if (compressed) set_bit(EXTENT_FLAG_COMPRESSED, &em->flags); ptr = btrfs_file_extent_inline_start(item) + extent_offset; |