From: Mikhail Zaslonko <zaslonko@linux.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Ilya Leoshkevich <iii@linux.ibm.com>,
Mikhail Zaslonko <zaslonko@linux.ibm.com>
Subject: [PATCH 3/8] lib/zlib: Fix DFLTCC not flushing EOBS when creating raw streams
Date: Thu, 26 Jan 2023 14:14:23 +0100 [thread overview]
Message-ID: <20230126131428.1222214-4-zaslonko@linux.ibm.com> (raw)
In-Reply-To: <20230126131428.1222214-1-zaslonko@linux.ibm.com>
This commit is based on:
https://github.com/zlib-ng/zlib-ng/commit/ca99a88
Signed-off-by: Mikhail Zaslonko <zaslonko@linux.ibm.com>
Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
lib/zlib_deflate/deflate.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/lib/zlib_deflate/deflate.c b/lib/zlib_deflate/deflate.c
index 8a878d0d892c..f30d6b8a69b2 100644
--- a/lib/zlib_deflate/deflate.c
+++ b/lib/zlib_deflate/deflate.c
@@ -451,17 +451,24 @@ int zlib_deflate(
Assert(strm->avail_out > 0, "bug2");
if (flush != Z_FINISH) return Z_OK;
- if (s->noheader) return Z_STREAM_END;
- /* Write the zlib trailer (adler32) */
- putShortMSB(s, (uInt)(strm->adler >> 16));
- putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ if (!s->noheader) {
+ /* Write zlib trailer (adler32) */
+ putShortMSB(s, (uInt)(strm->adler >> 16));
+ putShortMSB(s, (uInt)(strm->adler & 0xffff));
+ }
flush_pending(strm);
/* If avail_out is zero, the application will call deflate again
* to flush the rest.
*/
- s->noheader = -1; /* write the trailer only once! */
- return s->pending != 0 ? Z_OK : Z_STREAM_END;
+ if (!s->noheader) {
+ s->noheader = -1; /* write the trailer only once! */
+ }
+ if (s->pending == 0) {
+ Assert(s->bi_valid == 0, "bi_buf not flushed");
+ return Z_STREAM_END;
+ }
+ return Z_OK;
}
/* ========================================================================= */
--
2.34.1
next prev parent reply other threads:[~2023-01-26 13:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-26 13:14 [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 1/8] lib/zlib: Adjust offset calculation for dfltcc_state Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 2/8] lib/zlib: Implement switching between DFLTCC and software Mikhail Zaslonko
2023-01-26 13:14 ` Mikhail Zaslonko [this message]
2023-01-26 13:14 ` [PATCH 4/8] lib/zlib: Fix DFLTCC ignoring flush modes when avail_in == 0 Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 5/8] lib/zlib: DFLTCC not writing header bits when avail_out " Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 6/8] lib/zlib: Split deflate and inflate states for DFLTCC Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 7/8] lib/zlib: DFLTCC support inflate with small window Mikhail Zaslonko
2023-01-26 13:14 ` [PATCH 8/8] lib/zlib: DFLTCC always switch to software inflate for Z_PACKET_FLUSH option Mikhail Zaslonko
2023-01-26 23:16 ` [PATCH 0/8] lib/zlib: Set of s390 DFLTCC related patches for kernel zlib Andrew Morton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230126131428.1222214-4-zaslonko@linux.ibm.com \
--to=zaslonko@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®