RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: restore, for compressed extents don't read more bytes than needed 

We need to read a number of bytes corresponding to the disk size of the file extent
item, and not to the number of bytes in the num_bytes field. Normally disk_size is
smaller than num_bytes (when using compression), except for files created with lzo
compression in a kernel older then the one which introduced the following change:

commit 59516f6017c589e7316418fda6128ba8f829a77f
Author: Stefan Agner <stefan@agner.ch>
Date:   Mon Jul 1 20:33:39 2013 +0200

    Btrfs: return -1 when lzo compression makes data bigger

    With this fix the lzo code behaves like the zlib code by returning an
    error
    code when compression does not help reduce the size of the file.
    This is currently not a bug since the compressed size is checked again
    in
    the calling method compress_file_range.

Signed-off-by: Filipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Filipe David Borba Manana 2014-04-08 17:37:22 +01:00 committed by David Sterba
parent b53b11a8b4
commit d2334781fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmds-restore.c
View File

@ -297,7 +297,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
ram_size = btrfs_file_extent_ram_bytes(leaf, fi); ram_size = btrfs_file_extent_ram_bytes(leaf, fi);
offset = btrfs_file_extent_offset(leaf, fi); offset = btrfs_file_extent_offset(leaf, fi);
num_bytes = btrfs_file_extent_num_bytes(leaf, fi); num_bytes = btrfs_file_extent_num_bytes(leaf, fi);
size_left = num_bytes; size_left = disk_size;
if (compress == BTRFS_COMPRESS_NONE) if (compress == BTRFS_COMPRESS_NONE)
bytenr += offset; bytenr += offset;
@ -376,7 +376,7 @@ again:
goto out; goto out;
} }
ret = decompress(inbuf, outbuf, num_bytes, &ram_size, compress); ret = decompress(inbuf, outbuf, disk_size, &ram_size, compress);
if (ret) { if (ret) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree, num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
bytenr, length); bytenr, length);