diff options
| author | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2009-02-18 12:51:31 -0800 |
| commit | d164b2093561a9771db07346e6fffc9ca19427a2 (patch) | |
| tree | b24adaf8695cebdd827968ac1df3cc0093936be1 /lib/libzpool/kernel.c | |
| parent | c65e71073f45e6e549c825969740cb15a96ea547 (diff) | |
Rebase master to b108
Diffstat (limited to 'lib/libzpool/kernel.c')
| -rw-r--r-- | lib/libzpool/kernel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c index fe817cc64..89108fe5b 100644 --- a/lib/libzpool/kernel.c +++ b/lib/libzpool/kernel.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * 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/systeminfo.h> /* * Emulation of kernel services in userland. @@ -43,7 +44,7 @@ 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" @@ -778,7 +779,7 @@ kernel_init(int mode) 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); |