diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-07 21:00:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-07 21:00:47 -0400 |
| commit | 2a9f9d633d2e069e5d5e7acde050b338ec803692 (patch) | |
| tree | 40c97310da83790361c498e158ee3814e8e140a7 /fs/btrfs/compression.c | |
| parent | 314b9b4a38befd120ce1c566d9eea8e0ec9d8336 (diff) | |
| parent | b737c822c0c4f1210568f61e743236bb980ca645 (diff) | |
Merge branch '2020-09-14-btrfs-rewrite' into next
- Bring in the update to btrfs support that rewrites it based on
btrfs-progs.
Diffstat (limited to 'fs/btrfs/compression.c')
| -rw-r--r-- | fs/btrfs/compression.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c index 59e4a94cb2e..23efefa1997 100644 --- a/fs/btrfs/compression.c +++ b/fs/btrfs/compression.c @@ -115,7 +115,7 @@ static u32 decompress_zlib(const u8 *_cbuf, u32 clen, u8 *dbuf, u32 dlen) while (stream.total_in < clen) { stream.next_in = cbuf + stream.total_in; stream.avail_in = min((u32) (clen - stream.total_in), - (u32) btrfs_info.sb.sectorsize); + current_fs_info->sectorsize); ret = inflate(&stream, Z_NO_FLUSH); if (ret != Z_OK) |