svn commit: r196685 - in user/kmacy/head_zfs_merge/sys:
cddl/contrib/opensolaris/uts/common/zmod conf dev/mxge
geom/uzip kern libkern/zlib modules/netgraph modules/zlib net
opencrypto
Kip Macy
kmacy at FreeBSD.org
Mon Aug 31 03:44:06 UTC 2009
Author: kmacy
Date: Mon Aug 31 03:44:05 2009
New Revision: 196685
URL: http://svn.freebsd.org/changeset/base/196685
Log:
integrate:
193049
193050
193067
193075
194224
Update to zlib 1.2.3 point opensolaris at it
Added:
user/kmacy/head_zfs_merge/sys/libkern/zlib/
- copied from r193049, user/kmacy/releng_7_2_fcs/sys/libkern/zlib/
Modified:
user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c
user/kmacy/head_zfs_merge/sys/conf/files
user/kmacy/head_zfs_merge/sys/dev/mxge/if_mxge.c
user/kmacy/head_zfs_merge/sys/geom/uzip/g_uzip.c
user/kmacy/head_zfs_merge/sys/kern/link_elf.c
user/kmacy/head_zfs_merge/sys/kern/link_elf_obj.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/deflate.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/inflate.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/trees.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/uncompr.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/zl_crc32.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/zlib.h
user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.c
user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.h
user/kmacy/head_zfs_merge/sys/modules/netgraph/Makefile
user/kmacy/head_zfs_merge/sys/modules/zlib/Makefile
user/kmacy/head_zfs_merge/sys/net/zlib.c
user/kmacy/head_zfs_merge/sys/opencrypto/deflate.c
user/kmacy/head_zfs_merge/sys/opencrypto/deflate.h
Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -36,6 +36,7 @@
* The resulting decompressed size is then returned through dstlen. This
* function return Z_OK on success, or another error code on failure.
*/
+#if 0
int
z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
{
@@ -64,6 +65,7 @@ z_uncompress(void *dst, size_t *dstlen,
*dstlen = zs.total_out;
return (inflateEnd(&zs));
}
+#endif
int
z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
@@ -91,13 +93,6 @@ z_compress_level(void *dst, size_t *dstl
return (deflateEnd(&zs));
}
-int
-z_compress(void *dst, size_t *dstlen, const void *src, size_t srclen)
-{
- return (z_compress_level(dst, dstlen, src, srclen,
- Z_DEFAULT_COMPRESSION));
-}
-
/*
* Convert a zlib error code into a string error message.
*/
@@ -111,3 +106,12 @@ z_strerror(int err)
return (zError(err));
}
+
+#if 0
+int
+z_compress(void *dst, size_t *dstlen, const void *src, size_t srclen)
+{
+ return (z_compress_level(dst, dstlen, src, srclen,
+ Z_DEFAULT_COMPRESSION));
+}
+#endif
Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -30,40 +30,7 @@
#include <sys/cmn_err.h>
#include <sys/kobj.h>
-struct zchdr {
- uint_t zch_magic;
- uint_t zch_size;
-};
-
-#define ZCH_MAGIC 0x3cc13cc1
-
-/*ARGSUSED*/
-void *
-zcalloc(void *opaque, uint_t items, uint_t size)
-{
- size_t nbytes = sizeof (struct zchdr) + items * size;
- struct zchdr *z = kobj_zalloc(nbytes, KM_NOWAIT|KM_TMP);
-
- if (z == NULL)
- return (NULL);
-
- z->zch_magic = ZCH_MAGIC;
- z->zch_size = nbytes;
-
- return (z + 1);
-}
-
/*ARGSUSED*/
-void
-zcfree(void *opaque, void *ptr)
-{
- struct zchdr *z = ((struct zchdr *)ptr) - 1;
-
- if (z->zch_magic != ZCH_MAGIC)
- panic("zcfree region corrupt: hdr=%p ptr=%p", (void *)z, ptr);
-
- kobj_free(z, z->zch_size);
-}
void
zmemcpy(void *dest, const void *source, uint_t len)
Modified: user/kmacy/head_zfs_merge/sys/conf/files
==============================================================================
--- user/kmacy/head_zfs_merge/sys/conf/files Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/conf/files Mon Aug 31 03:44:05 2009 (r196685)
@@ -1910,6 +1910,7 @@ gnu/fs/reiserfs/reiserfs_stree.c optiona
gnu/fs/reiserfs/reiserfs_vfsops.c optional reiserfs
gnu/fs/reiserfs/reiserfs_vnops.c optional reiserfs
#
+
isa/isa_if.m standard
isa/isa_common.c optional isa
isa/isahint.c optional isa
@@ -1930,7 +1931,6 @@ kern/cpufreq_if.m standard
kern/device_if.m standard
kern/imgact_elf.c standard
kern/imgact_shell.c standard
-kern/inflate.c optional gzip
kern/init_main.c standard
kern/init_sysent.c standard
kern/ksched.c optional _kposix_priority_scheduling
@@ -2240,6 +2240,37 @@ net/vnet.c optional vimage
net/zlib.c optional crypto | geom_uzip | ipsec | \
mxge | netgraph_deflate | \
ddb_ctf
+libkern/zlib/adler32.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/compress.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/deflate.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/inflate.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/inffast.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/inftrees.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/trees.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/uncompr.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/zutil.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+libkern/zlib/zl_crc32.c optional zfs | crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | \
+ netgraph_deflate | ddb_ctf | gzip
+
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan wlan_acl
net80211/ieee80211_action.c optional wlan
@@ -2881,33 +2912,6 @@ cddl/contrib/opensolaris/uts/common/os/l
compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c optional zfs \
compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-
-
-cddl/contrib/opensolaris/uts/common/zmod/adler32.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/deflate.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/inffast.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/inflate.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/inftrees.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/trees.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/zmod.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-cddl/contrib/opensolaris/uts/common/zmod/zutil.c optional zfs \
- compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
-
-
-
-
-
cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c optional zfs \
compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c optional zfs \
@@ -3060,3 +3064,26 @@ cddl/contrib/opensolaris/uts/common/fs/z
cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c optional zfs \
compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+# Compression routines conflicting with ZFS
+
+#cddl/contrib/opensolaris/uts/common/zmod/deflate.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/inffast.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/trees.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/zutil.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/inflate.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/inftrees.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/adler32.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_IsNC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+#cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c optional zfs \
+# compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
+
+cddl/contrib/opensolaris/uts/common/zmod/zmod.c optional zfs \
+ compile-with "${ZFS_C} ${OPENSOLARIS_INC} ${ZFS_INC} ${ZFS_CFLAGS}"
Modified: user/kmacy/head_zfs_merge/sys/dev/mxge/if_mxge.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/dev/mxge/if_mxge.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/dev/mxge/if_mxge.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -58,7 +58,7 @@ __FBSDID("$FreeBSD$");
#include <net/if_types.h>
#include <net/if_vlan_var.h>
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
Modified: user/kmacy/head_zfs_merge/sys/geom/uzip/g_uzip.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/geom/uzip/g_uzip.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/geom/uzip/g_uzip.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <geom/geom.h>
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#undef GEOM_UZIP_DEBUG
#ifdef GEOM_UZIP_DEBUG
Modified: user/kmacy/head_zfs_merge/sys/kern/link_elf.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/kern/link_elf.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/kern/link_elf.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <sys/link_elf.h>
#ifdef DDB_CTF
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#endif
#include "linker_if.h"
Modified: user/kmacy/head_zfs_merge/sys/kern/link_elf_obj.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/kern/link_elf_obj.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/kern/link_elf_obj.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -60,7 +60,7 @@ __FBSDID("$FreeBSD$");
#include <sys/link_elf.h>
#ifdef DDB_CTF
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#endif
#include "linker_if.h"
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/deflate.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/deflate.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/deflate.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -297,7 +297,7 @@ int ZEXPORT deflateInit2_(strm, level, m
if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
s->pending_buf == Z_NULL) {
s->status = FINISH_STATE;
- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ strm->msg = __DECONST(char*, ERR_MSG(Z_MEM_ERROR));
deflateEnd (strm);
return Z_MEM_ERROR;
}
@@ -1225,7 +1225,7 @@ local uInt longest_match_fast(s, cur_mat
return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead;
}
-#ifdef DEBUG
+#if 0
/* ===========================================================================
* Check that the match at match_start is indeed a match.
*/
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/inflate.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/inflate.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/inflate.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -245,7 +245,7 @@ struct inflate_state FAR *state;
state->distbits = 5;
}
-#ifdef MAKEFIXED
+#if 0
#include <stdio.h>
/*
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/trees.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/trees.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/trees.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -35,9 +35,6 @@
#include <libkern/zlib/deflate.h>
-#ifdef DEBUG
-# include <ctype.h>
-#endif
/* ===========================================================================
* Constants
@@ -163,7 +160,7 @@ local void copy_block OF((deflate_st
local void gen_trees_header OF((void));
#endif
-#ifndef DEBUG
+#if 1
# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
/* Send a code of the given tree. c and tree must not have side effects */
@@ -318,7 +315,7 @@ local void tr_static_init()
/* ===========================================================================
* Genererate the file trees.h describing the static trees.
*/
-#ifdef GEN_TREES_H
+#if 0
# ifndef DEBUG
# include <stdio.h>
# endif
@@ -986,7 +983,8 @@ void _tr_flush_block(s, buf, stored_len,
} else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) {
#endif
send_bits(s, (STATIC_TREES<<1)+eof, 3);
- compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
+ compress_block(s, __DECONST(ct_data *, static_ltree),
+ __DECONST(ct_data *, static_dtree));
#ifdef DEBUG
s->compressed_len += 3 + s->static_len;
#endif
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/uncompr.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/uncompr.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/uncompr.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -32,7 +32,7 @@ int ZEXPORT uncompress (dest, destLen, s
z_stream stream;
int err;
- stream.next_in = (Bytef*)source;
+ stream.next_in = (Bytef*)(uintptr_t)source;
stream.avail_in = (uInt)sourceLen;
/* Check for source > 64K on 16-bit machine: */
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/zl_crc32.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zl_crc32.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/zl_crc32.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -22,7 +22,7 @@
one thread to use crc32().
*/
-#ifdef MAKECRCH
+#if 0
# include <stdio.h>
# ifndef DYNAMIC_CRC_TABLE
# define DYNAMIC_CRC_TABLE
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/zlib.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zlib.h Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/zlib.h Mon Aug 31 03:44:05 2009 (r196685)
@@ -30,7 +30,7 @@
#ifndef ZLIB_H
#define ZLIB_H
-
+#include <sys/types.h>
#include <libkern/zlib/zconf.h>
#ifdef __cplusplus
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.c Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -5,8 +5,20 @@
/* @(#) $Id$ */
+
+#ifdef _KERNEL
#include <libkern/zlib/zutil.h>
+/* Assume this is a *BSD or SVR4 kernel */
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+# define HAVE_MEMCPY
+#endif
+
#ifndef NO_DUMMY_DECL
struct internal_state {int dummy;}; /* for buggy compilers */
#endif
@@ -112,7 +124,7 @@ uLong ZEXPORT zlibCompileFlags()
return flags;
}
-#ifdef DEBUG
+#if 0
# ifndef verbose
# define verbose 0
@@ -334,3 +346,25 @@ zcfree(void *opaque, void *ptr)
#endif /* MY_ZCALLOC */
+
+#ifdef _KERNEL
+static int
+zlib_modevent(module_t mod, int type, void *unused)
+{
+ switch (type) {
+ case MOD_LOAD:
+ return 0;
+ case MOD_UNLOAD:
+ return 0;
+ }
+ return EINVAL;
+}
+
+static moduledata_t zlib_mod = {
+ "zlib",
+ zlib_modevent,
+ 0
+};
+DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
+MODULE_VERSION(zlib, 1);
+#endif /* _KERNEL */
Modified: user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.h
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/libkern/zlib/zutil.h Fri May 29 19:06:02 2009 (r193049)
+++ user/kmacy/head_zfs_merge/sys/libkern/zlib/zutil.h Mon Aug 31 03:44:05 2009 (r196685)
@@ -15,6 +15,7 @@
#define ZLIB_INTERNAL
#ifdef _KERNEL
+#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/malloc.h>
#include <sys/libkern.h>
@@ -61,7 +62,7 @@ extern const char * const z_errmsg[10];
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
#define ERR_RETURN(strm,err) \
- return (strm->msg = (char*)ERR_MSG(err), (err))
+ return (int)(uintptr_t)(strm->msg = __DECONST(char*, ERR_MSG(err)))
/* To be used only when the state is known to be valid */
/* common constants */
@@ -243,7 +244,7 @@ extern const char * const z_errmsg[10];
#endif
/* Diagnostic functions */
-#ifdef DEBUG
+#if 0
# include <stdio.h>
extern int z_verbose;
extern void z_error OF((char *m));
Modified: user/kmacy/head_zfs_merge/sys/modules/netgraph/Makefile
==============================================================================
--- user/kmacy/head_zfs_merge/sys/modules/netgraph/Makefile Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/modules/netgraph/Makefile Mon Aug 31 03:44:05 2009 (r196685)
@@ -11,7 +11,6 @@ SUBDIR= async \
bridge \
car \
cisco \
- deflate \
device \
echo \
eiface \
@@ -53,6 +52,8 @@ SUBDIR= async \
vjc \
vlan
+# deflate \
+
.if ${MK_BLUETOOTH} != "no" || defined(ALL_MODULES)
_bluetooth= bluetooth
.endif
Modified: user/kmacy/head_zfs_merge/sys/modules/zlib/Makefile
==============================================================================
--- user/kmacy/head_zfs_merge/sys/modules/zlib/Makefile Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/modules/zlib/Makefile Mon Aug 31 03:44:05 2009 (r196685)
@@ -1,8 +1,9 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/../../net
+.PATH: ${.CURDIR}/../../libkern/zlib
KMOD= zlib
-SRCS= zlib.c
+SRCS= adler32.c compress.c deflate.c inflate.c inffast.c inftrees.c
+SRCS+= trees.c uncompr.c zutil.c zl_crc32.c
.include <bsd.kmod.mk>
Modified: user/kmacy/head_zfs_merge/sys/net/zlib.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/net/zlib.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/net/zlib.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -5405,3 +5405,97 @@ static moduledata_t zlib_mod = {
DECLARE_MODULE(zlib, zlib_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
MODULE_VERSION(zlib, 1);
#endif /* _KERNEL */
+
+/**********************************************************************/
+/**********************************************************************/
+/**********************************************************************/
+
+/*
+ *
+ * Compression utility routines
+ *
+ */
+
+
+/*
+ * Uncompress the buffer 'src' into the buffer 'dst'. The caller must store
+ * the expected decompressed data size externally so it can be passed in.
+ * The resulting decompressed size is then returned through dstlen. This
+ * function return Z_OK on success, or another error code on failure.
+ */
+int
+z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
+{
+ z_stream zs;
+ int err;
+
+ bzero(&zs, sizeof (zs));
+ zs.next_in = (u_char *)src;
+ zs.avail_in = srclen;
+ zs.next_out = dst;
+ zs.avail_out = *dstlen;
+
+ /*
+ * Call inflateInit2() specifying a window size of DEF_WBITS
+ * with the 6th bit set to indicate that the compression format
+ * type (zlib or gzip) should be automatically detected.
+ */
+ if ((err = inflateInit2(&zs, DEF_WBITS | 0x20)) != Z_OK)
+ return (err);
+
+ if ((err = inflate(&zs, Z_FINISH)) != Z_STREAM_END) {
+ (void) inflateEnd(&zs);
+ return (err == Z_OK ? Z_BUF_ERROR : err);
+ }
+
+ *dstlen = zs.total_out;
+ return (inflateEnd(&zs));
+}
+
+int
+z_compress_level(void *dst, size_t *dstlen, const void *src, size_t srclen,
+ int level)
+{
+
+ z_stream zs;
+ int err;
+
+ bzero(&zs, sizeof (zs));
+ zs.next_in = (u_char *)src;
+ zs.avail_in = srclen;
+ zs.next_out = dst;
+ zs.avail_out = *dstlen;
+
+ if ((err = deflateInit(&zs, level)) != Z_OK)
+ return (err);
+
+ if ((err = deflate(&zs, Z_FINISH)) != Z_STREAM_END) {
+ (void) deflateEnd(&zs);
+ return (err == Z_OK ? Z_BUF_ERROR : err);
+ }
+
+ *dstlen = zs.total_out;
+ return (deflateEnd(&zs));
+}
+
+int
+z_compress(void *dst, size_t *dstlen, const void *src, size_t srclen)
+{
+ return (z_compress_level(dst, dstlen, src, srclen,
+ Z_DEFAULT_COMPRESSION));
+}
+
+/*
+ * Convert a zlib error code into a string error message.
+ */
+const char *
+z_strerror(int err)
+{
+ int i = Z_NEED_DICT - err;
+
+ if (i < 0 || i > Z_NEED_DICT - Z_VERSION_ERROR)
+ return ("unknown error");
+
+ return (ERR_MSG(err));
+}
+
Modified: user/kmacy/head_zfs_merge/sys/opencrypto/deflate.c
==============================================================================
--- user/kmacy/head_zfs_merge/sys/opencrypto/deflate.c Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/opencrypto/deflate.c Mon Aug 31 03:44:05 2009 (r196685)
@@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$");
#include <sys/malloc.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#include <opencrypto/cryptodev.h>
#include <opencrypto/deflate.h>
Modified: user/kmacy/head_zfs_merge/sys/opencrypto/deflate.h
==============================================================================
--- user/kmacy/head_zfs_merge/sys/opencrypto/deflate.h Mon Aug 31 02:45:47 2009 (r196684)
+++ user/kmacy/head_zfs_merge/sys/opencrypto/deflate.h Mon Aug 31 03:44:05 2009 (r196685)
@@ -36,7 +36,7 @@
#ifndef _CRYPTO_DEFLATE_H_
#define _CRYPTO_DEFLATE_H_
-#include <net/zlib.h>
+#include <libkern/zlib/zlib.h>
#define Z_METHOD 8
#define Z_MEMLEVEL 8
More information about the svn-src-user
mailing list