fs: btrfs: fix the false alert of decompression failure
PATCH 1/1 fs: btrfs: fix the false alert of decompression failure
There are some cases where decompressed sectors can have padding zeros.
In kernel code, we have lines to address such situation:
/*
* btrfs_getblock is doing a zero on the tail of the page too,
* but this will cover anything missing from the decompressed
* data.
*/
if (bytes < destlen)
memset(kaddr+bytes, 0, destlen-bytes);
kunmap_local(kaddr);
But not in U-boot code, thus we have some reports of U-boot failed to read compressed files in btrfs.
Fix it by doing the same thing of the kernel.
Reported-by Matwey Kornilov <[email protected]>
Fixes a26a6bedafcf ("fs: btrfs: Introduce btrfs_read_extent_inline() and btrfs_read_extent_reg()")
Signed-off-by Qu Wenruo <[email protected]>
--- fs/btrfs/inode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
fs/btrfs/inode.c +7 -1
@@ -390,10 +390,16 @@ int btrfs_read_extent_inline(struct btrfs_path *path, csize); ret =btrfs_decompress (btrfs_file_extent_compression (leaf, fi), cbuf, csize, dbuf, dsize); -if (ret <0 || ret != dsize) { +if (ret == (u32)-1 ) { ret = -EIO ; goto out; } +/* +* The compressed part ends before sector boundary, the remaining needs +* to be zeroed out. +*/ +if (ret < dsize) +memset (dbuf + ret,0 , dsize - ret);memcpy (dest, dbuf, dsize); ret = dsize; out:
Signature · 1 line
2.31.1