git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update COPYRIGHT to include release id LLNL-CODE-403049.
[zfs.git]
/
lib
/
libzpool
/
kernel.c
diff --git
a/lib/libzpool/kernel.c
b/lib/libzpool/kernel.c
index
fe817cc
..
89108fe
100644
(file)
--- a/
lib/libzpool/kernel.c
+++ b/
lib/libzpool/kernel.c
@@
-19,7
+19,7
@@
* CDDL HEADER END
*/
/*
* CDDL HEADER END
*/
/*
- * Copyright 200
8
Sun Microsystems, Inc. All rights reserved.
+ * Copyright 200
9
Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
* Use is subject to license terms.
*/
@@
-36,6
+36,7
@@
#include <sys/zfs_context.h>
#include <sys/zmod.h>
#include <sys/utsname.h>
#include <sys/zfs_context.h>
#include <sys/zmod.h>
#include <sys/utsname.h>
+#include <sys/systeminfo.h>
/*
* Emulation of kernel services in userland.
/*
* Emulation of kernel services in userland.
@@
-43,7
+44,7
@@
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
uint64_t physmem;
vnode_t *rootdir = (vnode_t *)0xabcd1234;
-char hw_serial[
11
];
+char hw_serial[
HW_HOSTID_LEN
];
struct utsname utsname = {
"userland", "libzpool", "1", "1", "na"
struct utsname utsname = {
"userland", "libzpool", "1", "1", "na"
@@
-778,7
+779,7
@@
kernel_init(int mode)
dprintf("physmem = %llu pages (%.2f GB)\n", physmem,
(double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30));
dprintf("physmem = %llu pages (%.2f GB)\n", physmem,
(double)physmem * sysconf(_SC_PAGE_SIZE) / (1ULL << 30));
- snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid());
+
(void)
snprintf(hw_serial, sizeof (hw_serial), "%ld", gethostid());
VERIFY((random_fd = open("/dev/random", O_RDONLY)) != -1);
VERIFY((urandom_fd = open("/dev/urandom", O_RDONLY)) != -1);
VERIFY((random_fd = open("/dev/random", O_RDONLY)) != -1);
VERIFY((urandom_fd = open("/dev/urandom", O_RDONLY)) != -1);