From: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
To: akpm@linux-foundation.org
Cc: bongkyu.kim@lge.com, rsalvaterra@gmail.com,
sergey.senozhatsky@gmail.com, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org, herbert@gondor.apana.org.au,
davem@davemloft.net, linux-crypto@vger.kernel.org,
anton@enomsg.org, ccross@android.com, keescook@chromium.org,
tony.luck@intel.com, phillip@squashfs.org.uk,
Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Subject: [PATCH 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version
Date: Sat, 21 Jan 2017 16:09:09 +0100 [thread overview]
Message-ID: <1485011351-7463-3-git-send-email-4sschmid@informatik.uni-hamburg.de> (raw)
In-Reply-To: <1485011351-7463-1-git-send-email-4sschmid@informatik.uni-hamburg.de>
This patch updates the unlz4 wrapper to work with the
updated LZ4 kernel module version.
Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
---
lib/decompress_unlz4.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/decompress_unlz4.c b/lib/decompress_unlz4.c
index 036fc88..1b0baf3 100644
--- a/lib/decompress_unlz4.c
+++ b/lib/decompress_unlz4.c
@@ -72,7 +72,7 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
error("NULL input pointer and missing fill function");
goto exit_1;
} else {
- inp = large_malloc(lz4_compressbound(uncomp_chunksize));
+ inp = large_malloc(LZ4_compressBound(uncomp_chunksize));
if (!inp) {
error("Could not allocate input buffer");
goto exit_1;
@@ -136,7 +136,7 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
inp += 4;
size -= 4;
} else {
- if (chunksize > lz4_compressbound(uncomp_chunksize)) {
+ if (chunksize > LZ4_compressBound(uncomp_chunksize)) {
error("chunk length is longer than allocated");
goto exit_2;
}
@@ -152,11 +152,14 @@ STATIC inline int INIT unlz4(u8 *input, long in_len,
out_len -= dest_len;
} else
dest_len = out_len;
- ret = lz4_decompress(inp, &chunksize, outp, dest_len);
+
+ ret = LZ4_decompress_fast(inp, outp, dest_len);
+ chunksize = ret;
#else
dest_len = uncomp_chunksize;
- ret = lz4_decompress_unknownoutputsize(inp, chunksize, outp,
- &dest_len);
+
+ ret = LZ4_decompress_safe(inp, outp, chunksize, dest_len);
+ dest_len = ret;
#endif
if (ret < 0) {
error("Decoding failed");
--
2.1.4
next prev parent reply other threads:[~2017-01-21 15:09 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1482259992-16680-1-git-send-email-4sschmid@informatik.uni-hamburg.de>
[not found] ` <1482259992-16680-2-git-send-email-4sschmid@informatik.uni-hamburg.de>
2016-12-22 13:25 ` [PATCH 1/3] crypto: Change lz4 modules to work with new lz4 compressor module version Sergey Senozhatsky
2017-01-07 16:55 ` [PATCH v2 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 1/4] lib: Update LZ4 compressor module based on LZ4 v1.7.2 Sven Schmidt
2017-01-08 11:22 ` Greg KH
2017-01-10 9:32 ` Sven Schmidt
2017-01-10 9:59 ` Greg KH
2017-01-08 11:25 ` Greg KH
2017-01-08 11:33 ` Rui Salvaterra
2017-01-10 9:21 ` Sven Schmidt
2017-01-10 10:00 ` Greg KH
2017-01-10 10:50 ` Willy Tarreau
2017-01-07 16:55 ` [PATCH v2 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-08 11:23 ` Greg KH
2017-01-07 16:55 ` [PATCH v2 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to comply " Sven Schmidt
2017-01-07 21:33 ` Kees Cook
2017-01-10 9:45 ` Sven Schmidt
2017-01-21 15:09 ` [PATCH v3 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-21 15:09 ` [PATCH 1/4] lib: " Sven Schmidt
2017-01-21 15:56 ` kbuild test robot
2017-01-21 16:16 ` kbuild test robot
2017-01-21 17:38 ` kbuild test robot
2017-01-22 11:05 ` Greg KH
2017-01-21 15:09 ` Sven Schmidt [this message]
2017-01-21 15:09 ` [PATCH 3/4] crypto: Change LZ4 modules to work with new LZ4 module version Sven Schmidt
2017-01-21 15:09 ` [PATCH 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 1/4] lib: " Sven Schmidt
2017-01-24 0:23 ` Andrew Morton
2017-01-24 16:48 ` Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 0/5] Update LZ4 compressor module Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 1/5] lib: " Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-01-26 9:19 ` [PATCH v5 0/5] Update LZ4 compressor module Eric Biggers
2017-01-26 14:15 ` Sven Schmidt
2017-01-27 22:01 ` [PATCH v6 " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 1/5] lib: " Sven Schmidt
2017-01-31 22:27 ` Jonathan Corbet
2017-02-01 20:18 ` Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 0/5] Update LZ4 compressor module Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 1/5] lib: " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-08 23:31 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-09 0:24 ` Eric Biggers
2017-02-09 5:24 ` Eric Biggers
2017-02-09 11:05 ` Sven Schmidt
2017-02-09 18:20 ` Eric Biggers
2017-02-10 0:14 ` Minchan Kim
2017-02-09 11:02 ` Sven Schmidt
2017-02-09 18:29 ` Eric Biggers
2017-02-10 3:57 ` David Miller
2017-02-09 10:56 ` Sven Schmidt
2017-02-10 0:13 ` Minchan Kim
2017-02-12 11:16 ` Sven Schmidt
2017-02-12 11:16 ` [PATCH] lz4: fix performance regressions Sven Schmidt
2017-02-12 13:05 ` Willy Tarreau
2017-02-12 15:20 ` Sven Schmidt
2017-02-12 21:41 ` Willy Tarreau
2017-02-13 11:53 ` Sven Schmidt
2017-02-13 13:37 ` Willy Tarreau
2017-02-12 23:38 ` Eric Biggers
2017-02-14 10:33 ` Sven Schmidt
2017-02-13 0:03 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-13 12:08 ` Sven Schmidt
2017-02-15 7:29 ` Minchan Kim
2017-02-15 18:16 ` [PATCH v8 " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 1/5] lib: " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
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=1485011351-7463-3-git-send-email-4sschmid@informatik.uni-hamburg.de \
--to=4sschmid@informatik.uni-hamburg.de \
--cc=akpm@linux-foundation.org \
--cc=anton@enomsg.org \
--cc=bongkyu.kim@lge.com \
--cc=ccross@android.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=keescook@chromium.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=phillip@squashfs.org.uk \
--cc=rsalvaterra@gmail.com \
--cc=sergey.senozhatsky@gmail.com \
--cc=tony.luck@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).