PERFORCE change 143320 for review
Julian Elischer
julian at FreeBSD.org
Wed Jun 11 22:12:50 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143320
Change 143320 by julian at julian_trafmon1 on 2008/06/11 22:12:15
revert bad conversion.. local shadows global
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 edit
Differences ...
==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 (text+ko) ====
@@ -58,7 +58,6 @@
#include <sys/fs/zfs.h>
#include <sys/callb.h>
#include <sys/sunddi.h>
-#include <sys/vimage.h>
int zio_taskq_threads = 0;
SYSCTL_DECL(_vfs_zfs);
@@ -603,11 +602,11 @@
*/
if (nvlist_lookup_uint64(newconfig, ZPOOL_CONFIG_HOSTID,
&hostid) == 0 && root_mounted()) {
- char *V_hostname;
+ char *hostname;
unsigned long myhostid = 0;
VERIFY(nvlist_lookup_string(newconfig,
- ZPOOL_CONFIG_HOSTNAME, &V_hostname) == 0);
+ ZPOOL_CONFIG_HOSTNAME, &hostname) == 0);
(void) ddi_strtoul(hw_serial, NULL, 10, &myhostid);
if ((unsigned long)hostid != myhostid) {
More information about the p4-projects
mailing list