From 3e8bfa75f73c9b5453b9ac29c9febcf211f061be Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@me.com>
Date: Tue, 13 Mar 2018 10:06:12 +0200
Subject: [PATCH] 9274 loader: Make struct libi386_devdesc match the struct
 devdesc better Reviewed by: Yuri Pankov <yuripv@yuripv.net> Reviewed by: Andy
 Fiddaman <omnios@citrus-it.co.uk> Approved by: Dan McDonald
 <danmcd@joyent.com>

---
 usr/src/boot/sys/boot/i386/libi386/libi386.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/usr/src/boot/sys/boot/i386/libi386/libi386.h b/usr/src/boot/sys/boot/i386/libi386/libi386.h
index 65bbd9b5d8..f5106bd8f5 100644
--- a/usr/src/boot/sys/boot/i386/libi386/libi386.h
+++ b/usr/src/boot/sys/boot/i386/libi386/libi386.h
@@ -37,22 +37,17 @@ struct i386_devdesc {
     struct devsw	*d_dev;
     int			d_type;
     int			d_unit;
+    void		*d_opendata;
     union 
     {
 	struct 
 	{
-	    void	*data;
 	    int		slice;
 	    int		partition;
 	    off_t	offset;
 	} biosdisk;
 	struct
 	{
-	    void	*data;
-	} bioscd;
-	struct
-	{
-	    void	*data;
 	    uint64_t	pool_guid;
 	    uint64_t	root_guid;
 	} zfs;
-- 
2.11.4.GIT