aboutsummaryrefslogtreecommitdiff
path: root/lib/zlib_deflate
diff options
context:
space:
mode:
authorGravatar Mikhail Zaslonko <zaslonko@linux.ibm.com> 2023-01-26 14:14:26 +0100
committerGravatar Andrew Morton <akpm@linux-foundation.org> 2023-02-02 22:50:09 -0800
commit9fec9f8ea51c782d58a8b86f8e868fc06c782386 (patch)
tree12df6a553a6eb2bdc0d61861462ae254eb6f44eb /lib/zlib_deflate
parentlib/zlib: DFLTCC not writing header bits when avail_out == 0 (diff)
downloadlinux-9fec9f8ea51c782d58a8b86f8e868fc06c782386.tar.gz
linux-9fec9f8ea51c782d58a8b86f8e868fc06c782386.tar.bz2
linux-9fec9f8ea51c782d58a8b86f8e868fc06c782386.zip
lib/zlib: Split deflate and inflate states for DFLTCC
Currently deflate and inflate both use a common state struct. There are several variables in this struct that we don't need for inflate, and more may be coming in the future. Therefore split them in two separate structs. Apart from that, introduce separate headers for dfltcc_deflate and dfltcc_inflate. This commit is based on: https://github.com/zlib-ng/zlib-ng/commit/c592b1b Link: https://lkml.kernel.org/r/20230126131428.1222214-7-zaslonko@linux.ibm.com Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com> Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Cc: Heiko Carstens <hca@linux.ibm.com> Cc: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'lib/zlib_deflate')
-rw-r--r--lib/zlib_deflate/deflate.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c
index f30d6b8a69b2..3a1d8d34182e 100644
--- a/lib/zlib_deflate/deflate.c
+++ b/lib/zlib_deflate/deflate.c
@@ -54,7 +54,7 @@
/* architecture-specific bits */
#ifdef CONFIG_ZLIB_DFLTCC
-# include "../zlib_dfltcc/dfltcc.h"
+# include "../zlib_dfltcc/dfltcc_deflate.h"
#else
#define DEFLATE_RESET_HOOK(strm) do {} while (0)
#define DEFLATE_HOOK(strm, flush, bstate) 0
@@ -106,7 +106,7 @@ typedef struct deflate_workspace {
deflate_state deflate_memory;
#ifdef CONFIG_ZLIB_DFLTCC
/* State memory for s390 hardware deflate */
- struct dfltcc_state dfltcc_memory;
+ struct dfltcc_deflate_state dfltcc_memory;
#endif
Byte *window_memory;
Pos *prev_memory;