diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h index cda2c98e5..af3e98a07 100644 --- a/include/sys/efi_partition.h +++ b/include/sys/efi_partition.h @@ -369,7 +369,6 @@ _SYS_EFI_PARTITION_H int efi_alloc_and_read(int, struct dk_gpt **); _SYS_EFI_PARTITION_H int efi_write(int, struct dk_gpt *); _SYS_EFI_PARTITION_H int efi_rescan(int); _SYS_EFI_PARTITION_H void efi_free(struct dk_gpt *); -_SYS_EFI_PARTITION_H int efi_type(int); _SYS_EFI_PARTITION_H void efi_err_check(struct dk_gpt *); _SYS_EFI_PARTITION_H int efi_use_whole_disk(int fd); #endif diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c index 6acfdc5e1..b4fec0c86 100644 --- a/lib/libefi/rdwr_efi.c +++ b/lib/libefi/rdwr_efi.c @@ -1541,34 +1541,6 @@ efi_free(struct dk_gpt *ptr) free(ptr); } -/* - * Input: File descriptor - * Output: 1 if disk has an EFI label, or > 2TB with no VTOC or legacy MBR. - * Otherwise 0. - */ -int -efi_type(int fd) -{ -#if 0 - struct vtoc vtoc; - struct extvtoc extvtoc; - - if (ioctl(fd, DKIOCGEXTVTOC, &extvtoc) == -1) { - if (errno == ENOTSUP) - return (1); - else if (errno == ENOTTY) { - if (ioctl(fd, DKIOCGVTOC, &vtoc) == -1) - if (errno == ENOTSUP) - return (1); - } - } - return (0); -#else - (void) fd; - return (ENOSYS); -#endif -} - void efi_err_check(struct dk_gpt *vtoc) { diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi index b682f4f70..122321103 100644 --- a/lib/libzfs/libzfs.abi +++ b/lib/libzfs/libzfs.abi @@ -165,7 +165,6 @@ - @@ -841,10 +840,6 @@ - - - -