| Message ID | 1483808145-18417-3-git-send-email-4sschmid@informatik.uni-hamburg.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
On Sat, Jan 07, 2017 at 05:55:43PM +0100, Sven Schmidt wrote: > This patch updates the unlz4 wrapper to work with the new 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)); Having functions differ by different cases of the characters is ripe for abuse and confusion. Please never do that, especially as these "new" functions you created don't follow the correct kernel coding style rules :( thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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");
This patch updates the unlz4 wrapper to work with the new 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(-)