From 498ac8238d98cc5f7153fa58a5e0a5222ffd88be Mon Sep 17 00:00:00 2001 From: Cyber Knight Date: Thu, 10 Mar 2022 15:32:13 +0800 Subject: [PATCH] [contrib][linux] Make zstd_reset_cstream() functionally identical to ZSTD_resetCStream() - As referenced by Nick Terrelln ~ the ZSTD maintainer in the linux kernel, making zstd_reset_cstream() functionally identical to ZSTD_resetCStream() would be the perfect way to fix the warning without touching any core functions or breaking other parts of the code. Suggested-by: Nick Terrell Signed-off-by: Cyber Knight --- contrib/linux-kernel/zstd_compress_module.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/linux-kernel/zstd_compress_module.c b/contrib/linux-kernel/zstd_compress_module.c index 8b4c764d..04e1b5c0 100644 --- a/contrib/linux-kernel/zstd_compress_module.c +++ b/contrib/linux-kernel/zstd_compress_module.c @@ -131,9 +131,13 @@ zstd_cstream *zstd_init_cstream(const zstd_parameters *parameters, EXPORT_SYMBOL(zstd_init_cstream); size_t zstd_reset_cstream(zstd_cstream *cstream, - unsigned long long pledgedSrcSize) + unsigned long long pledged_src_size) { - return ZSTD_CCtx_setPledgedSrcSize(cstream, pledgedSrcSize); + if (pledged_src_size == 0) + pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN; + ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_reset(cstream, ZSTD_reset_session_only) ); + ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_setPledgedSrcSize(cstream, pledged_src_size) ); + return 0; } EXPORT_SYMBOL(zstd_reset_cstream);