Add fix-no-zmod branch

diff --git a/.topdeps b/.topdeps
new file mode 100644 (file)
index 0000000..1f7391f
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master

diff --git a/.topmsg b/.topmsg
new file mode 100644 (file)
index 0000000..496d3a9
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,11 @@
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Subject: [PATCH] fix no zmod
+
+Do not use zmod.h in userspace.
+
+This has also been filed with the ZFS team. It makes the userspace
+libzpool code use the zlib API, instead of the Solaris-only and
+non-standard zmod.h.  The zlib API is almost identical and is a de
+facto standard, so this is a no-brainer.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/zfs/lib/libzpool/gzip.c b/zfs/lib/libzpool/gzip.c
index 94c76042dbf0e9100fad0b59018ea63913fc6416..327c756330cd392fa3669b52db6b2c62065f038a 100644 (file)
--- a/zfs/lib/libzpool/gzip.c
+++ b/zfs/lib/libzpool/gzip.c
@@ -28,22 +28,35 @@
 
 #include <sys/debug.h>
 #include <sys/types.h>
-#include <sys/zmod.h>
 
 #ifdef _KERNEL
+
 #include <sys/systm.h>
-#else
+#include <sys/zmod.h>
+
+typedef size_t zlen_t;
+#define compress_func   z_compress_level
+#define uncompress_func z_uncompress
+
+#else /* _KERNEL */
+
 #include <strings.h>
+#include <zlib.h>
+
+typedef uLongf zlen_t;
+#define compress_func   compress2
+#define uncompress_func uncompress
+
 #endif
 
 size_t
 gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 {
-       size_t dstlen = d_len;
+       zlen_t dstlen = d_len;
 
        ASSERT(d_len <= s_len);
 
-       if (z_compress_level(d_start, &dstlen, s_start, s_len, n) != Z_OK) {
+       if (compress_func(d_start, &dstlen, s_start, s_len, n) != Z_OK) {
                if (d_len != s_len)
                        return (s_len);
 
@@ -51,18 +64,18 @@ gzip_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
                return (s_len);
        }
 
-       return (dstlen);
+       return ((size_t) dstlen);
 }
 
 /*ARGSUSED*/
 int
 gzip_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 {
-       size_t dstlen = d_len;
+       zlen_t dstlen = d_len;
 
        ASSERT(d_len >= s_len);
 
-       if (z_uncompress(d_start, &dstlen, s_start, s_len) != Z_OK)
+       if (uncompress_func(d_start, &dstlen, s_start, s_len) != Z_OK)
                return (-1);
 
        return (0);

diff --git a/zfs/lib/libzpool/kernel.c b/zfs/lib/libzpool/kernel.c
index 71317446de074564e82978487e6784116337d3c2..bd5ca345d4326fb5cfaede838cd34decb79f5b25 100644 (file)
--- a/zfs/lib/libzpool/kernel.c
+++ b/zfs/lib/libzpool/kernel.c
@@ -36,7 +36,6 @@
 #include <sys/stat.h>
 #include <sys/processor.h>
 #include <sys/zfs_context.h>
-#include <sys/zmod.h>
 #include <sys/utsname.h>
 
 /*
@@ -801,31 +800,6 @@ kernel_fini(void)
        urandom_fd = -1;
 }
 
-int
-z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
-{
-       int ret;
-       uLongf len = *dstlen;
-
-       if ((ret = uncompress(dst, &len, src, srclen)) == Z_OK)
-               *dstlen = (size_t)len;
-
-       return (ret);
-}
-
-int
-z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
-    int level)
-{
-       int ret;
-       uLongf len = *dstlen;
-
-       if ((ret = compress2(dst, &len, src, srclen, level)) == Z_OK)
-               *dstlen = (size_t)len;
-
-       return (ret);
-}
-
 /*ARGSUSED*/
 size_t u8_textprep_str(char *i, size_t *il, char *o, size_t *ol, int nf,
     size_t vers, int *err)