Integrate carcass of libspl/i/s/vtoc.h into i/s/efi_partition.h

Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #12996

6 files changed, 10 insertions, 63 deletions

diff --git a/cmd/zpool/os/linux/zpool_vdev_os.c b/cmd/zpool/os/linux/zpool_vdev_os.c
index 9d2c21c2a..ed157c627 100644
--- a/cmd/zpool/os/linux/zpool_vdev_os.c
+++ b/cmd/zpool/os/linux/zpool_vdev_os.c
@@ -81,7 +81,6 @@
 #include <scsi/sg.h>
 #include <sys/efi_partition.h>
 #include <sys/stat.h>
-#include <sys/vtoc.h>
 #include <sys/mntent.h>
 #include <uuid/uuid.h>
 #include <blkid/blkid.h>
diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h
index f793837e3..7d5e42e94 100644
--- a/include/sys/efi_partition.h
+++ b/include/sys/efi_partition.h
@@ -73,6 +73,11 @@ typedef struct efi_gpe_Attrs {
 			RequiredPartition	:1;
 } efi_gpe_Attrs_t;
 
+/* MBR partition identification tags */
+#define	V_UNASSIGNED	0x00		/* unassigned partition */
+#define	V_USR		0x04		/* Usr filesystem */
+#define	V_RESERVED	0x0b		/* SMI reserved data */
+
 /*
  * 6a96237f-1dd2-11b2-99a6-080020736631	V_UNASSIGNED (not used as such)
  * 6a898cc3-1dd2-11b2-99a6-080020736631	V_USR
@@ -355,6 +360,11 @@ struct partition64 {
 #endif
 
 #ifndef _KERNEL
+#define	VT_ERROR	(-2)		/* errno supplies specific error */
+#define	VT_EIO		(-3)		/* I/O error accessing vtoc */
+#define	VT_EINVAL	(-4)		/* illegal value in vtoc or request */
+#define	VT_ENOSPC	(-6)		/* requested space not found */
+
 _SYS_EFI_PARTITION_H int efi_debug;
 _SYS_EFI_PARTITION_H int efi_alloc_and_init(int, uint32_t, struct dk_gpt **);
 _SYS_EFI_PARTITION_H int efi_alloc_and_read(int, struct dk_gpt **);
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 950c9562f..30fddc3db 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -35,7 +35,6 @@
 #include <libintl.h>
 #include <sys/types.h>
 #include <sys/dkio.h>
-#include <sys/vtoc.h>
 #include <sys/mhd.h>
 #include <sys/param.h>
 #include <sys/dktp/fdisk.h>
@@ -856,7 +855,6 @@ efi_read(int fd, struct dk_gpt *vtoc)
 	}
 
 	for (i = 0; i < vtoc->efi_nparts; i++) {
-
 		UUID_LE_CONVERT(vtoc->efi_parts[i].p_guid,
 		    efi_parts[i].efi_gpe_PartitionTypeGUID);
 
diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am
index 8305a5180..4315470b5 100644
--- a/lib/libspl/include/sys/Makefile.am
+++ b/lib/libspl/include/sys/Makefile.am
@@ -43,6 +43,5 @@ libspl_HEADERS = \
 	va_list.h \
 	varargs.h \
 	vnode.h \
-	vtoc.h \
 	wmsum.h \
 	zone.h
diff --git a/lib/libspl/include/sys/vtoc.h b/lib/libspl/include/sys/vtoc.h
deleted file mode 100644
index fe8c77719..000000000
--- a/lib/libspl/include/sys/vtoc.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * 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.
- * 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 2009 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-
-#ifndef _SYS_VTOC_H
-#define	_SYS_VTOC_H
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Partition identification tags
- */
-#define	V_UNASSIGNED	0x00		/* unassigned partition */
-#define	V_USR		0x04		/* Usr filesystem */
-#define	V_RESERVED	0x0b		/* SMI reserved data */
-
-/*
- * error codes for reading & writing vtoc
- */
-#define	VT_ERROR	(-2)		/* errno supplies specific error */
-#define	VT_EIO		(-3)		/* I/O error accessing vtoc */
-#define	VT_EINVAL	(-4)		/* illegal value in vtoc or request */
-#define	VT_ENOSPC	(-6)		/* requested space not found */
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _SYS_VTOC_H */
diff --git a/lib/libzfs/os/linux/libzfs_pool_os.c b/lib/libzfs/os/linux/libzfs_pool_os.c
index 147efbc0e..570615cfd 100644
--- a/lib/libzfs/os/linux/libzfs_pool_os.c
+++ b/lib/libzfs/os/linux/libzfs_pool_os.c
@@ -41,7 +41,6 @@
 #include <sys/stat.h>
 #include <sys/efi_partition.h>
 #include <sys/systeminfo.h>
-#include <sys/vtoc.h>
 #include <sys/zfs_ioctl.h>
 #include <sys/vdev_disk.h>
 #include <dlfcn.h>