--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c	2008-07-15 16:52:39.042921877 +0200
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c.new	2008-07-15 16:53:07.926385278 +0200
@@ -43,6 +43,8 @@
 static arc_done_func_t dbuf_write_ready;
 static arc_done_func_t dbuf_write_done;
 
+extern int zfs_mdcomp_disable;
+
 SYSCTL_DECL(_vfs_zfs);
 TUNABLE_INT("vfs.zfs.mdcomp_disable", &zfs_mdcomp_disable);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN,
--- cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	2008-07-14 22:47:53.585233553 +0200
+++ cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c.new	2008-07-14 22:47:37.812657709 +0200
@@ -294,6 +294,7 @@
 	nvlist_t **child;
 	uint_t c, children;
 
+#if 0
 	if (nvlist_lookup_nvlist_array(config, ZPOOL_CONFIG_CHILDREN,
 	    &child, &children) != 0)
 		return (read_efi_label(config, NULL) >= 0);
@@ -302,6 +303,7 @@
 		if (pool_uses_efi(child[c]))
 			return (B_TRUE);
 	}
+#endif
 	return (B_FALSE);
 }