diff options
Diffstat (limited to 'lib/decompress_inflate.c')
| -rw-r--r-- | lib/decompress_inflate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c index e36b296fc9f8..68dfce59c1b8 100644 --- a/lib/decompress_inflate.c +++ b/lib/decompress_inflate.c | |||
| @@ -19,13 +19,13 @@ | |||
| 19 | #include "zlib_inflate/inflate.h" | 19 | #include "zlib_inflate/inflate.h" |
| 20 | 20 | ||
| 21 | #include "zlib_inflate/infutil.h" | 21 | #include "zlib_inflate/infutil.h" |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #endif /* STATIC */ | 24 | #endif /* STATIC */ |
| 24 | 25 | ||
| 25 | #include <linux/decompress/mm.h> | 26 | #include <linux/decompress/mm.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | 27 | ||
| 28 | #define INBUF_LEN (16*1024) | 28 | #define GZIP_IOBUF_SIZE (16*1024) |
| 29 | 29 | ||
| 30 | /* Included from initramfs et al code */ | 30 | /* Included from initramfs et al code */ |
| 31 | STATIC int INIT gunzip(unsigned char *buf, int len, | 31 | STATIC int INIT gunzip(unsigned char *buf, int len, |
| @@ -55,7 +55,7 @@ STATIC int INIT gunzip(unsigned char *buf, int len, | |||
| 55 | if (buf) | 55 | if (buf) |
| 56 | zbuf = buf; | 56 | zbuf = buf; |
| 57 | else { | 57 | else { |
| 58 | zbuf = malloc(INBUF_LEN); | 58 | zbuf = malloc(GZIP_IOBUF_SIZE); |
| 59 | len = 0; | 59 | len = 0; |
| 60 | } | 60 | } |
| 61 | if (!zbuf) { | 61 | if (!zbuf) { |
| @@ -77,7 +77,7 @@ STATIC int INIT gunzip(unsigned char *buf, int len, | |||
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | if (len == 0) | 79 | if (len == 0) |
| 80 | len = fill(zbuf, INBUF_LEN); | 80 | len = fill(zbuf, GZIP_IOBUF_SIZE); |
| 81 | 81 | ||
| 82 | /* verify the gzip header */ | 82 | /* verify the gzip header */ |
| 83 | if (len < 10 || | 83 | if (len < 10 || |
| @@ -113,7 +113,7 @@ STATIC int INIT gunzip(unsigned char *buf, int len, | |||
| 113 | while (rc == Z_OK) { | 113 | while (rc == Z_OK) { |
| 114 | if (strm->avail_in == 0) { | 114 | if (strm->avail_in == 0) { |
| 115 | /* TODO: handle case where both pos and fill are set */ | 115 | /* TODO: handle case where both pos and fill are set */ |
| 116 | len = fill(zbuf, INBUF_LEN); | 116 | len = fill(zbuf, GZIP_IOBUF_SIZE); |
| 117 | if (len < 0) { | 117 | if (len < 0) { |
| 118 | rc = -1; | 118 | rc = -1; |
| 119 | error("read error"); | 119 | error("read error"); |
