summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2010-08-26 10:29:11 -0700
committerBrian Behlendorf <[email protected]>2010-08-31 08:38:46 -0700
commiteaa8687be33318ae07d61a91e0069244b326f450 (patch)
tree94aefff7ffd9ca2af5d270192a6c73e8b15b6c2b /lib
parent3f504482929e4c4e098ec00b335ddc45509be716 (diff)
Fix zmod.h usage in userspace
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 <[email protected]>
Diffstat (limited to 'lib')
-rw-r--r--lib/libzpool/kernel.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index adbe6ba08..b64f03da4 100644
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -33,7 +33,6 @@
#include <sys/stat.h>
#include <sys/processor.h>
#include <sys/zfs_context.h>
-#include <sys/zmod.h>
#include <sys/utsname.h>
#include <sys/systeminfo.h>
@@ -844,31 +843,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);
-}
-
uid_t
crgetuid(cred_t *cr)
{