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 /module/zfs/spa_config.c | |
| parent | c65e71073f45e6e549c825969740cb15a96ea547 (diff) | |
Rebase master to b108
Diffstat (limited to 'module/zfs/spa_config.c')
| -rw-r--r-- | module/zfs/spa_config.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/module/zfs/spa_config.c b/module/zfs/spa_config.c index 252869d69..1c47efd0c 100644 --- a/module/zfs/spa_config.c +++ b/module/zfs/spa_config.c @@ -20,7 +20,7 @@ */ /* - * 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/sunddi.h> #ifdef _KERNEL #include <sys/kobj.h> +#include <sys/zone.h> #endif /* @@ -352,7 +353,15 @@ spa_config_generate(spa_t *spa, vdev_t *vd, uint64_t txg, int getstats) txg) == 0); VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_POOL_GUID, spa_guid(spa)) == 0); +#ifdef _KERNEL + hostid = zone_get_hostid(NULL); +#else /* _KERNEL */ + /* + * We're emulating the system's hostid in userland, so we can't use + * zone_get_hostid(). + */ (void) ddi_strtoul(hw_serial, NULL, 10, &hostid); +#endif /* _KERNEL */ if (hostid != 0) { VERIFY(nvlist_add_uint64(config, ZPOOL_CONFIG_HOSTID, hostid) == 0); |