diff --git a/lib/libspl/include/sys/mhd.h b/lib/libspl/include/sys/mhd.h
new file mode 100644
index 0000000000..fcc062d51c
--- /dev/null
+++ b/lib/libspl/include/sys/mhd.h
@@ -0,0 +1,159 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#ifndef _SYS_MHD_H
+#define	_SYS_MHD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Definitions for multi-host device I/O control commands
+ */
+#define	MHIOC				('M'<<8)
+#define	MHIOCENFAILFAST			(MHIOC|1)
+#define	MHIOCTKOWN			(MHIOC|2)
+#define	MHIOCRELEASE			(MHIOC|3)
+#define	MHIOCSTATUS			(MHIOC|4)
+#define	MHIOCGRP_INKEYS 		(MHIOC|5)
+#define	MHIOCGRP_INRESV 		(MHIOC|6)
+#define	MHIOCGRP_REGISTER		(MHIOC|7)
+#define	MHIOCGRP_RESERVE		(MHIOC|8)
+#define	MHIOCGRP_PREEMPTANDABORT	(MHIOC|9)
+#define	MHIOCGRP_PREEMPT		(MHIOC|10)
+#define	MHIOCGRP_CLEAR			(MHIOC|11)
+#define	MHIOCGRP_REGISTERANDIGNOREKEY	(MHIOC|14)
+#define	MHIOCQRESERVE			(MHIOC|12)
+#define	MHIOCREREGISTERDEVID		(MHIOC|13)
+
+/*
+ * Following is the structure to specify the delay parameters in
+ * milliseconds, via the MHIOCTKOWN ioctl.
+ */
+struct mhioctkown {
+	int reinstate_resv_delay;
+	int min_ownership_delay;
+	int max_ownership_delay;
+};
+
+#define	MHIOC_RESV_KEY_SIZE	8
+typedef struct mhioc_resv_key {
+	uchar_t	key[MHIOC_RESV_KEY_SIZE];
+} mhioc_resv_key_t;
+
+typedef struct mhioc_key_list {
+	uint32_t		listsize;
+	uint32_t		listlen;
+	mhioc_resv_key_t	*list;
+} mhioc_key_list_t;
+
+typedef struct mhioc_inkeys {
+	uint32_t		generation;
+	mhioc_key_list_t	*li;
+} mhioc_inkeys_t;
+
+#if defined(_SYSCALL32)
+struct mhioc_key_list32 {
+	uint32_t		listsize;
+	uint32_t		listlen;
+	caddr32_t		list;
+} mhioc_key_list32_t;
+
+struct mhioc_inkeys32 {
+	uint32_t		generation;
+	caddr32_t		li;
+} mhioc_inkeys32_t;
+#endif
+
+typedef struct mhioc_resv_desc {
+	mhioc_resv_key_t	key;
+	uint8_t			type;
+	uint8_t			scope;
+	uint32_t		scope_specific_addr;
+} mhioc_resv_desc_t;
+
+typedef struct mhioc_resv_desc_list {
+	uint32_t		listsize;
+	uint32_t		listlen;
+	mhioc_resv_desc_t	*list;
+} mhioc_resv_desc_list_t;
+
+typedef struct mhioc_inresvs {
+	uint32_t		generation;
+	mhioc_resv_desc_list_t	*li;
+} mhioc_inresvs_t;
+
+#if defined(_SYSCALL32)
+struct mhioc_resv_desc_list32 {
+	uint32_t		listsize;
+	uint32_t		listlen;
+	caddr32_t		list;
+} mhioc_resv_desc_list32_t;
+
+typedef struct mhioc_inresvs32 {
+	uint32_t		generation;
+	caddr32_t		li;
+} mhioc_inresvs32_t;
+#endif
+
+typedef struct mhioc_register {
+    mhioc_resv_key_t	oldkey;
+    mhioc_resv_key_t	newkey;
+    boolean_t		aptpl;  /* True if persistent across power failures */
+} mhioc_register_t;
+
+typedef struct mhioc_preemptandabort {
+    mhioc_resv_desc_t	resvdesc;
+    mhioc_resv_key_t	victim_key;
+} mhioc_preemptandabort_t;
+
+typedef struct mhioc_registerandignorekey {
+    mhioc_resv_key_t	newkey;
+    boolean_t		aptpl;  /* True if persistent across power failures */
+} mhioc_registerandignorekey_t;
+
+/*
+ * SCSI-3 PGR Reservation Type Codes.  Codes with the _OBSOLETE suffix
+ * have been removed from the SCSI3 PGR standard.
+ */
+#define	SCSI3_RESV_READSHARED_OBSOLETE			0
+#define	SCSI3_RESV_WRITEEXCLUSIVE			1
+#define	SCSI3_RESV_READEXCLUSIVE_OBSOLETE		2
+#define	SCSI3_RESV_EXCLUSIVEACCESS			3
+#define	SCSI3_RESV_SHAREDACCESS_OBSOLETE		4
+#define	SCSI3_RESV_WRITEEXCLUSIVEREGISTRANTSONLY	5
+#define	SCSI3_RESV_EXCLUSIVEACCESSREGISTRANTSONLY	6
+
+#define	SCSI3_SCOPE_LOGICALUNIT				0
+#define	SCSI3_SCOPE_EXTENT_OBSOLETE			1
+#define	SCSI3_SCOPE_ELEMENT				2
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _SYS_MHD_H */
diff --git a/lib/libspl/include/sys/vtoc.h b/lib/libspl/include/sys/vtoc.h
index 3dd25eeb10..004b49097a 100644
--- a/lib/libspl/include/sys/vtoc.h
+++ b/lib/libspl/include/sys/vtoc.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 1997-1998,2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,8 +32,6 @@
 #ifndef _SYS_VTOC_H
 #define	_SYS_VTOC_H
 
-
-
 #include <sys/dklabel.h>
 
 #ifdef	__cplusplus
@@ -64,6 +62,7 @@ extern "C" {
 
 #define	VTOC_SANE	0x600DDEEE	/* Indicates a sane VTOC */
 #define	V_VERSION	0x01		/* layout version number */
+#define	V_EXTVERSION	V_VERSION	/* extvtoc layout version number */
 
 /*
  * Partition identification tags
@@ -94,10 +93,12 @@ extern "C" {
 #define	VT_EIO		(-3)		/* I/O error accessing vtoc */
 #define	VT_EINVAL	(-4)		/* illegal value in vtoc or request */
 #define	VT_ENOTSUP	(-5)		/* VTOC op. not supported */
+#define	VT_ENOSPC	(-6)		/* requested space not found */
+#define	VT_EOVERFLOW	(-7)		/* VTOC op. data struct limited */
 
 struct partition	{
 	ushort_t p_tag;			/* ID tag of partition */
-	ushort_t p_flag;			/* permision flags */
+	ushort_t p_flag;		/* permission flags */
 	daddr_t	p_start;		/* start sector no of partition */
 	long	p_size;			/* # of blocks in partition */
 };
@@ -115,10 +116,83 @@ struct vtoc {
 	char	v_asciilabel[LEN_DKL_ASCII];	/* for compatibility */
 };
 
+struct extpartition {
+	ushort_t p_tag;			/* ID tag of partition */
+	ushort_t p_flag;		/* permission flags */
+	ushort_t p_pad[2];
+	diskaddr_t p_start;		/* start sector no of partition */
+	diskaddr_t p_size;			/* # of blocks in partition */
+};
+
+
+struct extvtoc {
+	uint64_t	v_bootinfo[3];	/* info needed by mboot (unsupported) */
+	uint64_t	v_sanity;	/* to verify vtoc sanity */
+	uint64_t	v_version;	/* layout version */
+	char	v_volume[LEN_DKL_VVOL];	/* volume name */
+	ushort_t	v_sectorsz;	/* sector size in bytes */
+	ushort_t	v_nparts;	/* number of partitions */
+	ushort_t	pad[2];
+	uint64_t	v_reserved[10];
+	struct extpartition v_part[V_NUMPAR]; /* partition headers */
+	uint64_t timestamp[V_NUMPAR];	/* partition timestamp (unsupported) */
+	char	v_asciilabel[LEN_DKL_ASCII];	/* for compatibility */
+};
+
+#ifdef _KERNEL
+#define	extvtoctovtoc(extv, v)						\
+	{								\
+	int i;								\
+	v.v_bootinfo[0]		= (unsigned long)extv.v_bootinfo[0];	\
+	v.v_bootinfo[1]		= (unsigned long)extv.v_bootinfo[1];	\
+	v.v_bootinfo[2]		= (unsigned long)extv.v_bootinfo[2];	\
+	v.v_sanity		= (unsigned long)extv.v_sanity;		\
+	v.v_version		= (unsigned long)extv.v_version;	\
+	bcopy(extv.v_volume, v.v_volume, LEN_DKL_VVOL);			\
+	v.v_sectorsz		= extv.v_sectorsz;			\
+	v.v_nparts		= extv.v_nparts;			\
+	for (i = 0; i < 10; i++)					\
+		v.v_reserved[i] = (unsigned long)extv.v_reserved[i];	\
+	for (i = 0; i < V_NUMPAR; i++) {				\
+		v.v_part[i].p_tag = extv.v_part[i].p_tag;		\
+		v.v_part[i].p_flag = extv.v_part[i].p_flag;		\
+		v.v_part[i].p_start = (daddr_t)extv.v_part[i].p_start;	\
+		v.v_part[i].p_size = (long)extv.v_part[i].p_size;	\
+		v.timestamp[i] = (time_t)extv.timestamp[i];		\
+	}								\
+	bcopy(extv.v_asciilabel, v.v_asciilabel, LEN_DKL_ASCII);	\
+	}
+
+#define	vtoctoextvtoc(v, extv)						\
+	{								\
+	int i;								\
+	extv.v_bootinfo[0]	= (uint64_t)v.v_bootinfo[0];		\
+	extv.v_bootinfo[1]	= (uint64_t)v.v_bootinfo[1];		\
+	extv.v_bootinfo[2]	= (uint64_t)v.v_bootinfo[2];		\
+	extv.v_sanity		= (uint64_t)v.v_sanity;			\
+	extv.v_version		= (uint64_t)v.v_version;		\
+	bcopy(v.v_volume, extv.v_volume, LEN_DKL_VVOL);			\
+	extv.v_sectorsz		= v.v_sectorsz;				\
+	extv.v_nparts		= v.v_nparts;				\
+	for (i = 0; i < 10; i++)					\
+		extv.v_reserved[i] = (uint64_t)v.v_reserved[i];		\
+	for (i = 0; i < V_NUMPAR; i++) {				\
+		extv.v_part[i].p_tag = v.v_part[i].p_tag;		\
+		extv.v_part[i].p_flag = v.v_part[i].p_flag;		\
+		extv.v_part[i].p_start =				\
+		    (diskaddr_t)(unsigned long)v.v_part[i].p_start;	\
+		extv.v_part[i].p_size =					\
+		    (diskaddr_t)(unsigned long)v.v_part[i].p_size;	\
+		extv.timestamp[i] = (uint64_t)v.timestamp[i];		\
+	}								\
+	bcopy(v.v_asciilabel, extv.v_asciilabel, LEN_DKL_ASCII);	\
+	}
+#endif /* _KERNEL */
+
 #if defined(_SYSCALL32)
 struct partition32	{
 	uint16_t	p_tag;		/* ID tag of partition */
-	uint16_t	p_flag;		/* permision flags */
+	uint16_t	p_flag;		/* permission flags */
 	daddr32_t	p_start;	/* start sector no of partition */
 	int32_t		p_size;		/* # of blocks in partition */
 };
@@ -153,14 +227,39 @@ struct vtoc32 {
 	for (i = 0; i < V_NUMPAR; i++) {		\
 		v.v_part[i].p_tag = (ushort_t)v32.v_part[i].p_tag;	\
 		v.v_part[i].p_flag = (ushort_t)v32.v_part[i].p_flag;	\
-		v.v_part[i].p_start = (daddr_t)v32.v_part[i].p_start;	\
-		v.v_part[i].p_size = (long)v32.v_part[i].p_size;	\
+		v.v_part[i].p_start = (unsigned)v32.v_part[i].p_start;	\
+		v.v_part[i].p_size = (unsigned)v32.v_part[i].p_size;	\
 	}						\
 	for (i = 0; i < V_NUMPAR; i++)			\
 		v.timestamp[i] = (time_t)v32.timestamp[i];		\
 	bcopy(v32.v_asciilabel, v.v_asciilabel, LEN_DKL_ASCII);		\
 	}
 
+#define	vtoc32toextvtoc(v32, extv)					\
+	{								\
+	int i;								\
+	extv.v_bootinfo[0]		= v32.v_bootinfo[0];		\
+	extv.v_bootinfo[1]		= v32.v_bootinfo[1];		\
+	extv.v_bootinfo[2]		= v32.v_bootinfo[2];		\
+	extv.v_sanity		= v32.v_sanity;				\
+	extv.v_version		= v32.v_version;			\
+	bcopy(v32.v_volume, extv.v_volume, LEN_DKL_VVOL);		\
+	extv.v_sectorsz		= v32.v_sectorsz;			\
+	extv.v_nparts		= v32.v_nparts;				\
+	extv.v_version		= v32.v_version;			\
+	for (i = 0; i < 10; i++)					\
+		extv.v_reserved[i] = v32.v_reserved[i];			\
+	for (i = 0; i < V_NUMPAR; i++) {				\
+		extv.v_part[i].p_tag = (ushort_t)v32.v_part[i].p_tag;	\
+		extv.v_part[i].p_flag = (ushort_t)v32.v_part[i].p_flag;	\
+		extv.v_part[i].p_start = (diskaddr_t)v32.v_part[i].p_start; \
+		extv.v_part[i].p_size = (diskaddr_t)v32.v_part[i].p_size; \
+		extv.timestamp[i] = (time_t)v32.timestamp[i];		\
+	}								\
+	bcopy(v32.v_asciilabel, extv.v_asciilabel, LEN_DKL_ASCII);	\
+	}
+
+
 #define	vtoctovtoc32(v, v32)				\
 	{						\
 	int i;						\
@@ -178,8 +277,8 @@ struct vtoc32 {
 	for (i = 0; i < V_NUMPAR; i++) {		\
 		v32.v_part[i].p_tag = (ushort_t)v.v_part[i].p_tag;	\
 		v32.v_part[i].p_flag = (ushort_t)v.v_part[i].p_flag;	\
-		v32.v_part[i].p_start = (daddr32_t)v.v_part[i].p_start;	\
-		v32.v_part[i].p_size = (int32_t)v.v_part[i].p_size;	\
+		v32.v_part[i].p_start = (unsigned)v.v_part[i].p_start;	\
+		v32.v_part[i].p_size = (unsigned)v.v_part[i].p_size;	\
 	}						\
 	for (i = 0; i < V_NUMPAR; i++) {		\
 		if (v.timestamp[i] > TIME32_MAX)	\
@@ -190,6 +289,36 @@ struct vtoc32 {
 	bcopy(v.v_asciilabel, v32.v_asciilabel, LEN_DKL_ASCII);		\
 	}
 
+#define	extvtoctovtoc32(extv, v32)				\
+	{						\
+	int i;						\
+	v32.v_bootinfo[0]	= extv.v_bootinfo[0];	\
+	v32.v_bootinfo[1]	= extv.v_bootinfo[1];	\
+	v32.v_bootinfo[2]	= extv.v_bootinfo[2];	\
+	v32.v_sanity		= extv.v_sanity;		\
+	v32.v_version		= extv.v_version;		\
+	bcopy(extv.v_volume, v32.v_volume, LEN_DKL_VVOL);	\
+	v32.v_sectorsz		= extv.v_sectorsz;		\
+	v32.v_nparts		= extv.v_nparts;		\
+	v32.v_version		= extv.v_version;		\
+	for (i = 0; i < 10; i++)			\
+		v32.v_reserved[i] = extv.v_reserved[i];	\
+	for (i = 0; i < V_NUMPAR; i++) {		\
+		v32.v_part[i].p_tag = (ushort_t)extv.v_part[i].p_tag;	\
+		v32.v_part[i].p_flag = (ushort_t)extv.v_part[i].p_flag;	\
+		v32.v_part[i].p_start = (unsigned)extv.v_part[i].p_start; \
+		v32.v_part[i].p_size = (unsigned)extv.v_part[i].p_size;	\
+	}						\
+	for (i = 0; i < V_NUMPAR; i++) {		\
+		if (extv.timestamp[i] > TIME32_MAX)	\
+			v32.timestamp[i] = TIME32_MAX;	\
+		else 					\
+			v32.timestamp[i] = (time32_t)extv.timestamp[i];	\
+	}						\
+	bcopy(extv.v_asciilabel, v32.v_asciilabel, LEN_DKL_ASCII);	\
+	}
+
+
 #endif /* _SYSCALL32 */
 
 /*
@@ -202,11 +331,15 @@ struct vtoc32 {
 
 extern	int	read_vtoc(int, struct vtoc *);
 extern	int	write_vtoc(int, struct vtoc *);
+extern	int	read_extvtoc(int, struct extvtoc *);
+extern	int	write_extvtoc(int, struct extvtoc *);
 
 #else
 
 extern	int	read_vtoc();
 extern	int	write_vtoc();
+extern	int	read_extvtoc();
+extern	int	write_extvtoc();
 
 #endif 	/* __STDC__ */