1 Do not use zmod.h in userspace.
3 Index: zfs+chaos4/lib/libzpool/gzip.c
4 ===================================================================
5 --- zfs+chaos4.orig/lib/libzpool/gzip.c
6 +++ zfs+chaos4/lib/libzpool/gzip.c
10 #include <sys/types.h>
11 -#include <sys/zmod.h>
15 #include <sys/systm.h>
17 +#include <sys/zmod.h>
19 +typedef size_t zlen_t;
20 +#define compress_func z_compress_level
21 +#define uncompress_func z_uncompress
28 +typedef uLongf zlen_t;
29 +#define compress_func compress2
30 +#define uncompress_func uncompress
35 gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
37 - size_t dstlen = d_len;
38 + zlen_t dstlen = d_len;
40 ASSERT(d_len <= s_len);
42 - if (z_compress_level(d_start, &dstlen, s_start, s_len, n) != Z_OK) {
43 + if (compress_func(d_start, &dstlen, s_start, s_len, n) != Z_OK) {
47 @@ -51,18 +64,18 @@ gzip_compress(void *s_start, void *d_sta
52 + return ((size_t) dstlen);
57 gzip_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
59 - size_t dstlen = d_len;
60 + zlen_t dstlen = d_len;
62 ASSERT(d_len >= s_len);
64 - if (z_uncompress(d_start, &dstlen, s_start, s_len) != Z_OK)
65 + if (uncompress_func(d_start, &dstlen, s_start, s_len) != Z_OK)
69 Index: zfs+chaos4/lib/libzpool/kernel.c
70 ===================================================================
71 --- zfs+chaos4.orig/lib/libzpool/kernel.c
72 +++ zfs+chaos4/lib/libzpool/kernel.c
75 #include <sys/processor.h>
76 #include <sys/zfs_context.h>
77 -#include <sys/zmod.h>
78 #include <sys/utsname.h>
81 @@ -876,31 +875,6 @@ kernel_fini(void)
86 -z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
89 - uLongf len = *dstlen;
91 - if ((ret = uncompress(dst, &len, src, srclen)) == Z_OK)
92 - *dstlen = (size_t)len;
98 -z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
102 - uLongf len = *dstlen;
104 - if ((ret = compress2(dst, &len, src, srclen, level)) == Z_OK)
105 - *dstlen = (size_t)len;
111 size_t u8_textprep_str(char *i, size_t *il, char *o, size_t *ol, int nf,
112 size_t vers, int *err)