aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/sys/byteorder.h4
-rw-r--r--include/sys/cred.h28
-rw-r--r--include/sys/kmem.h8
-rw-r--r--include/sys/sysmacros.h19
-rw-r--r--include/sys/zmod.h112
5 files changed, 163 insertions, 8 deletions
diff --git a/include/sys/byteorder.h b/include/sys/byteorder.h
new file mode 100644
index 000000000..3b626163d
--- /dev/null
+++ b/include/sys/byteorder.h
@@ -0,0 +1,4 @@
+#ifndef _SPL_ZMOD_H
+#define _SPL_ZMOD_H
+
+#endif /* SPL_ZMOD_H */
diff --git a/include/sys/cred.h b/include/sys/cred.h
index 0935a19fa..401f3130a 100644
--- a/include/sys/cred.h
+++ b/include/sys/cred.h
@@ -33,9 +33,35 @@ typedef struct cred {
/* auditinfo_addr_t cr_auinfo; audit info */
} cred_t;
+#define kcred NULL
+#define CRED() NULL
+
+static __inline__ uid_t
+crgetuid(cred_t *cr)
+{
+ return 0;
+}
+
+static __inline__ gid_t
+crgetgid(cred_t *cr)
+{
+ return 0;
+}
+
+static __inline__ int
+crgetngroups(cred_t *cr)
+{
+ return 0;
+}
+
+static __inline__ gid_t *
+crgetgroups(cred_t *cr)
+{
+ return NULL;
+}
+
#ifdef __cplusplus
}
#endif
#endif /* _SPL_CRED_H */
-
diff --git a/include/sys/kmem.h b/include/sys/kmem.h
index 7bdd6fe24..c5e559cbd 100644
--- a/include/sys/kmem.h
+++ b/include/sys/kmem.h
@@ -58,7 +58,7 @@ extern unsigned int kmem_alloc_max;
#define kmem_free(ptr, size) \
({ \
- BUG_ON(!ptr); \
+ BUG_ON(!ptr || size < 0); \
atomic_sub((size), &kmem_alloc_used); \
memset(ptr, 0x5a, (size)); /* Poison */ \
kfree(ptr); \
@@ -70,7 +70,11 @@ extern unsigned int kmem_alloc_max;
#define kmem_alloc(size, flags) kmalloc(size, flags)
#define kmem_zalloc(size, flags) kzalloc(size, flags)
-#define kmem_free(ptr, size) kfree(ptr)
+#define kmem_free(ptr, size) \
+({ \
+ BUG_ON(!ptr || size < 0); \
+ kfree(ptr); \
+})
#endif /* DEBUG_KMEM */
diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
index a96c47fa4..3bc9f7a37 100644
--- a/include/sys/sysmacros.h
+++ b/include/sys/sysmacros.h
@@ -17,7 +17,14 @@ extern "C" {
#define TRUE 1
#define INT32_MAX INT_MAX
-#define UINT64_MAX (~0ULL)
+#define INT32_MIN INT_MIN
+#define UINT32_MAX UINT_MAX
+#define UINT32_MIN UINT_MIN
+#define INT64_MAX LLONG_MAX
+#define INT64_MIN LLONG_MIN
+#define UINT64_MAX ULLONG_MAX
+#define UINT64_MIN ULLONG_MIN
+
#define NBBY 8
#define ENOTSUP ENOTSUPP
@@ -98,22 +105,22 @@ extern "C" {
#ifdef DTRACE_PROBE1
#undef DTRACE_PROBE1
#endif /* DTRACE_PROBE1 */
-#define DTRACE_PROBE1(a, b, c) ((void)0)
+#define DTRACE_PROBE1(a, b, c) ((void)0)
#ifdef DTRACE_PROBE2
#undef DTRACE_PROBE2
#endif /* DTRACE_PROBE2 */
-#define DTRACE_PROBE2(a, b, c, d, e) ((void)0)
+#define DTRACE_PROBE2(a, b, c, d, e) ((void)0)
#ifdef DTRACE_PROBE3
#undef DTRACE_PROBE3
#endif /* DTRACE_PROBE3 */
-#define DTRACE_PROBE3(a, b, c, d, e, f, g) ((void)0)
+#define DTRACE_PROBE3(a, b, c, d, e, f, g) ((void)0)
#ifdef DTRACE_PROBE4
#undef DTRACE_PROBE4
#endif /* DTRACE_PROBE4 */
-#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0)
+#define DTRACE_PROBE4(a, b, c, d, e, f, g, h, i) ((void)0)
/* Missing globals */
extern int p0;
@@ -122,6 +129,8 @@ extern int p0;
extern int highbit(unsigned long i);
#define makedevice(maj,min) makedev(maj,min)
+#define zone_dataset_visible(x, y) (1)
+#define INGLOBALZONE(z) (1)
/* XXX - Borrowed from zfs project libsolcompat/include/sys/sysmacros.h */
/* common macros */
diff --git a/include/sys/zmod.h b/include/sys/zmod.h
new file mode 100644
index 000000000..c5216a8fd
--- /dev/null
+++ b/include/sys/zmod.h
@@ -0,0 +1,112 @@
+#ifndef _SPL_ZMOD_H
+#define _SPL_ZMOD_H
+
+#include <linux/zlib.h>
+
+/* NOTE: z_compress_level/z_uncompress are nearly identical copies of
+ * the compress2/uncompress functions provided by the official zlib
+ * package available at http://zlib.net/. The only changes made we to
+ * slightly adapt the functioned called to match the linux kernel
+ * implementation of zlib.
+ */
+
+/* ===========================================================================
+ * Compresses the source buffer into the destination buffer. The level
+ * parameter has the same meaning as in deflateInit. sourceLen is the byte
+ * length of the source buffer. Upon entry, destLen is the total size of the
+ * destination buffer, which must be at least 0.1% larger than sourceLen plus
+ * 12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
+ *
+ * compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+ * memory, Z_BUF_ERROR if there was not enough room in the output buffer,
+ * Z_STREAM_ERROR if the level parameter is invalid.
+ */
+static __inline__ int
+z_compress_level(Byte *dest, uLong *destLen, const Byte *source,
+ uLong sourceLen, int level)
+{
+ z_stream stream;
+ int err;
+
+ stream.next_in = (Byte *)source;
+ stream.avail_in = (uInt)sourceLen;
+#ifdef MAXSEG_64K
+ /* Check for source > 64K on 16-bit machine: */
+ if ((uLong)stream.avail_in != sourceLen)
+ return Z_BUF_ERROR;
+#endif
+ stream.next_out = dest;
+ stream.avail_out = (uInt)*destLen;
+
+ if ((uLong)stream.avail_out != *destLen)
+ return Z_BUF_ERROR;
+
+ err = zlib_deflateInit(&stream, level);
+ if (err != Z_OK)
+ return err;
+
+ err = zlib_deflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ zlib_deflateEnd(&stream);
+ return err == Z_OK ? Z_BUF_ERROR : err;
+ }
+ *destLen = stream.total_out;
+
+ err = zlib_deflateEnd(&stream);
+ return err;
+} /* z_compress_level() */
+
+/* ===========================================================================
+ * Decompresses the source buffer into the destination buffer. sourceLen is
+ * the byte length of the source buffer. Upon entry, destLen is the total
+ * size of the destination buffer, which must be large enough to hold the
+ * entire uncompressed data. (The size of the uncompressed data must have
+ * been saved previously by the compressor and transmitted to the decompressor
+ * by some mechanism outside the scope of this compression library.)
+ * Upon exit, destLen is the actual size of the compressed buffer.
+ * This function can be used to decompress a whole file at once if the
+ * input file is mmap'ed.
+ *
+ * uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
+ * enough memory, Z_BUF_ERROR if there was not enough room in the output
+ * buffer, or Z_DATA_ERROR if the input data was corrupted.
+ */
+static __inline__ int
+z_uncompress(Byte *dest, uLong *destLen, const Byte *source, uLong sourceLen)
+{
+ z_stream stream;
+ int err;
+
+ stream.next_in = (Byte *)source;
+ stream.avail_in = (uInt)sourceLen;
+ /* Check for source > 64K on 16-bit machine: */
+ if ((uLong)stream.avail_in != sourceLen)
+ return Z_BUF_ERROR;
+
+ stream.next_out = dest;
+ stream.avail_out = (uInt)*destLen;
+
+ if ((uLong)stream.avail_out != *destLen)
+ return Z_BUF_ERROR;
+
+ err = zlib_inflateInit(&stream);
+ if (err != Z_OK)
+ return err;
+
+ err = zlib_inflate(&stream, Z_FINISH);
+ if (err != Z_STREAM_END) {
+ zlib_inflateEnd(&stream);
+
+ if (err == Z_NEED_DICT ||
+ (err == Z_BUF_ERROR && stream.avail_in == 0))
+ return Z_DATA_ERROR;
+
+ return err;
+ }
+ *destLen = stream.total_out;
+
+ err = zlib_inflateEnd(&stream);
+ return err;
+} /* z_uncompress() */
+
+#endif /* SPL_ZMOD_H */