Module Name: src
Committed By: haad
Date: Sun Feb 28 17:36:51 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libzfs: mnttab.c
src/external/cddl/osnet/lib/libzpool: kernel.c
Added Files:
src/external/cddl/osnet/lib/libzfs: stubs.c
Log Message:
Add fixes for missing symbols from libzfs and libzpool.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzfs/mnttab.c
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/lib/libzfs/stubs.c
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzpool/kernel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzfs/mnttab.c
diff -u src/external/cddl/osnet/lib/libzfs/mnttab.c:1.1 src/external/cddl/osnet/lib/libzfs/mnttab.c:1.2
--- src/external/cddl/osnet/lib/libzfs/mnttab.c:1.1 Fri Aug 7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzfs/mnttab.c Sun Feb 28 17:36:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mnttab.c,v 1.1 2009/08/07 20:57:56 haad Exp $ */
+/* $NetBSD: mnttab.c,v 1.2 2010/02/28 17:36:51 haad Exp $ */
/*-
* Copyright (c) 2006 Pawel Jakub Dawidek <p...@freebsd.org>
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/compat/opensolaris/misc/mnttab.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); */
-__RCSID("$NetBSD: mnttab.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
+__RCSID("$NetBSD: mnttab.c,v 1.2 2010/02/28 17:36:51 haad Exp $");
#include <sys/param.h>
#include <sys/statvfs.h>
@@ -195,3 +195,10 @@
free(statvfs);
return (0);
}
+
+int
+getmntent(FILE *file, struct mnttab *mnttab) {
+
+
+ return 1;
+}
Index: src/external/cddl/osnet/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.1 src/external/cddl/osnet/lib/libzpool/kernel.c:1.2
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.1 Fri Aug 7 20:57:56 2009
+++ src/external/cddl/osnet/lib/libzpool/kernel.c Sun Feb 28 17:36:51 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kernel.c,v 1.1 2009/08/07 20:57:56 haad Exp $ */
+/* $NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $ */
/*
* CDDL HEADER START
@@ -29,7 +29,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/cdefs.h>
-__RCSID("$NetBSD: kernel.c,v 1.1 2009/08/07 20:57:56 haad Exp $");
+__RCSID("$NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $");
#include <sys/zfs_context.h>
#include <sys/sysctl.h>
@@ -54,6 +54,7 @@
#ifdef XXXNETBSD
int hz = 119; /* frequency when using gethrtime() >> 23 for lbolt */
#endif
+int aok;
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
char hw_serial[11];
@@ -63,6 +64,9 @@
"userland"
};
+/* this only exists to have its address taken */
+struct proc p0;
+
/*
* =========================================================================
* threads
@@ -692,3 +696,10 @@
return npg * pgsize;
}
+
+void
+print_timestamp(int fmt)
+{
+
+ return;
+}
Added files:
Index: src/external/cddl/osnet/lib/libzfs/stubs.c
diff -u /dev/null src/external/cddl/osnet/lib/libzfs/stubs.c:1.1
--- /dev/null Sun Feb 28 17:36:51 2010
+++ src/external/cddl/osnet/lib/libzfs/stubs.c Sun Feb 28 17:36:51 2010
@@ -0,0 +1,17 @@
+#include <errno.h>
+#include <libintl.h>
+#include <link.h>
+#include <pthread.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <libzfs.h>
+
+#include "libzfs_impl.h"
+
+void
+libzfs_fru_clear(libzfs_handle_t *hld, boolean_t bol)
+{
+
+ return;
+}
