From owner-p4-projects@FreeBSD.ORG  Wed Jun 11 22:12:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 534A91065676; Wed, 11 Jun 2008 22:12:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 116C3106566C
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 22:12:50 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E226B8FC13
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 22:12:49 +0000 (UTC)
	(envelope-from julian@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5BMCncf004793
	for <perforce@freebsd.org>; Wed, 11 Jun 2008 22:12:49 GMT
	(envelope-from julian@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5BMCn3R004791
	for perforce@freebsd.org; Wed, 11 Jun 2008 22:12:49 GMT
	(envelope-from julian@freebsd.org)
Date: Wed, 11 Jun 2008 22:12:49 GMT
Message-Id: <200806112212.m5BMCn3R004791@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	julian@freebsd.org using -f
From: Julian Elischer <julian@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143320 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jun 2008 22:12:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=143320

Change 143320 by julian@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) {