diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-07-13 12:09:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-08 12:52:50 +0200 |
| commit | b4a9782d4f56333e897dccc35c2c27e2605f6b93 (patch) | |
| tree | aa381d7e76cfadb7cb62b119d700aa17d0d612b7 /fs/squashfs | |
| parent | 6c03bdf8f99932efcc4e01bed04698ca6d9f4eab (diff) | |
| download | barebox-b4a9782d4f56333e897dccc35c2c27e2605f6b93.tar.gz | |
lib: zstd: sync with Linux
Import the Linux v5.18.3 state of the zstd decompression code. The
compressor was omitted and error strings were disabled for PBL.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20220713100922.1880282-3-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/zstd_wrapper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/squashfs/zstd_wrapper.c b/fs/squashfs/zstd_wrapper.c index 86740edd48..aae981f6ce 100644 --- a/fs/squashfs/zstd_wrapper.c +++ b/fs/squashfs/zstd_wrapper.c @@ -39,7 +39,7 @@ static void *zstd_init(struct squashfs_sb_info *msblk, void *buff) goto failed; wksp->window_size = max_t(size_t, msblk->block_size, SQUASHFS_METADATA_SIZE); - wksp->mem_size = ZSTD_DStreamWorkspaceBound(wksp->window_size); + wksp->mem_size = zstd_dstream_workspace_bound(wksp->window_size); wksp->mem = vmalloc(wksp->mem_size); if (wksp->mem == NULL) goto failed; @@ -75,7 +75,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm, ZSTD_inBuffer in_buf = { NULL, 0, 0 }; ZSTD_outBuffer out_buf = { NULL, 0, 0 }; - stream = ZSTD_initDStream(wksp->window_size, wksp->mem, wksp->mem_size); + stream = zstd_init_dstream(wksp->window_size, wksp->mem, wksp->mem_size); if (!stream) { ERROR("Failed to initialize zstd decompressor\n"); |