PSARC 2002/240 ZFS

6338653 Integrate ZFS
PSARC 2004/652 - DKIOCFLUSH
5096886 Write caching disks need mechanism to flush cache to physical media

6 files changed, 11 insertions, 11 deletions

diff --git a/usr/src/stand/lib/inet/dhcpv4.c b/usr/src/stand/lib/inet/dhcpv4.c
index c09f8965b7..3ddd0389af 100644
--- a/usr/src/stand/lib/inet/dhcpv4.c
+++ b/usr/src/stand/lib/inet/dhcpv4.c
@@ -1110,12 +1110,12 @@ prom_cached_reply(int cache_present)
 	if ((len = pxe_ack_cache(&ack)) <= 0)
 		return (B_FALSE);
 #else
-	dnode_t	chosen;
+	pnode_t	chosen;
 	char	*prop = PROM_BOOT_CACHED;
 
 	chosen = prom_finddevice("/chosen");
 	if (chosen == OBP_NONODE || chosen == OBP_BADNODE)
-		chosen = prom_nextnode((dnode_t)0);	/* root node */
+		chosen = prom_nextnode((pnode_t)0);	/* root node */
 
 	if ((len = prom_getproplen(chosen, prop)) <= 0)
 		return (B_FALSE);
diff --git a/usr/src/stand/lib/inet/ibd.c b/usr/src/stand/lib/inet/ibd.c
index f7ed38cdb9..3294ba46ff 100644
--- a/usr/src/stand/lib/inet/ibd.c
+++ b/usr/src/stand/lib/inet/ibd.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -564,7 +564,7 @@ ibd_output(int index, struct inetgram *ogp)
 void
 ibd_init(void)
 {
-	dnode_t	chosen;
+	pnode_t	chosen;
 	char	*mtuprop = "ipib-frame-size";
 	char	*bcastprop = "ipib-broadcast";
 	char	*addrprop = "ipib-address";
diff --git a/usr/src/stand/lib/inet/mac.c b/usr/src/stand/lib/inet/mac.c
index aff32286fe..009523b5f9 100644
--- a/usr/src/stand/lib/inet/mac.c
+++ b/usr/src/stand/lib/inet/mac.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -83,7 +83,7 @@ mac_init(char *bootdevicename)
 	static char	*chosen_net = "chosen-network-type";
 	static char	*supported_net = "supported-network-types";
 	static char	*netiftype = "network-interface-type";
-	dnode_t		node;
+	pnode_t		node;
 	char		*wp, *media_type;
 	int		len = 0, i;
 #endif	/* !__i386 */
diff --git a/usr/src/stand/lib/sa/sparc/prom_misc.c b/usr/src/stand/lib/sa/sparc/prom_misc.c
index b3dba7e8bb..ac6baa9e01 100644
--- a/usr/src/stand/lib/sa/sparc/prom_misc.c
+++ b/usr/src/stand/lib/sa/sparc/prom_misc.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -44,7 +44,7 @@ prom_create_encoded_prop(char *propname, void *prop_data, int prop_datalen,
 					" pop-package"
 					" r> to my-self";
 	char *command;
-	static dnode_t cn = OBP_NONODE;
+	static pnode_t cn = OBP_NONODE;
 
 	if (cn == OBP_NONODE) {
 		cn = prom_finddevice("/chosen");
diff --git a/usr/src/stand/lib/sock/socket.c b/usr/src/stand/lib/sock/socket.c
index 9d80b3a738..9db6dd7fd2 100644
--- a/usr/src/stand/lib/sock/socket.c
+++ b/usr/src/stand/lib/sock/socket.c
@@ -1248,7 +1248,7 @@ get_netconfig_strategy(void)
 	char	lbootpath[OBP_MAXPATHLEN];
 	char	net_options[NCT_BUFSIZE];
 	char	*op, *nop, *sp;
-	dnode_t	cn;
+	pnode_t	cn;
 	int	proplen;
 
 	/* If the PROM DHCP cache exists, we're done */
diff --git a/usr/src/stand/lib/wanboot/bootinfo_aux.c b/usr/src/stand/lib/wanboot/bootinfo_aux.c
index 7e9f29fab5..10d5ae6494 100644
--- a/usr/src/stand/lib/wanboot/bootinfo_aux.c
+++ b/usr/src/stand/lib/wanboot/bootinfo_aux.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -56,7 +56,7 @@ bi_end_bootinfo(void)
 boolean_t
 bi_get_chosen_prop(const char *name, void *valbuf, size_t *vallenp)
 {
-	static dnode_t	chosen;
+	static pnode_t	chosen;
 	int		len;
 
 	/*