From d366c8fd7a163f17e8984952d8f0aeb550844e8a Mon Sep 17 00:00:00 2001
From: Jorgen Lundman <lundman@lundman.net>
Date: Wed, 17 Jun 2020 03:43:33 +0900
Subject: Make struct vdev_disk_t be platform private

Linux defines different vdev_disk_t members to macOS, but they are
only used in vdev_disk.c so move the declaration there.

Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Jorgen Lundman <lundman@lundman.net>
Closes #10452
---
 include/sys/vdev_disk.h         | 8 --------
 module/os/linux/zfs/vdev_disk.c | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/include/sys/vdev_disk.h b/include/sys/vdev_disk.h
index 908f5f326..a7e19fbf0 100644
--- a/include/sys/vdev_disk.h
+++ b/include/sys/vdev_disk.h
@@ -42,13 +42,5 @@
 
 #ifdef _KERNEL
 #include <sys/vdev.h>
-
-typedef struct vdev_disk {
-	ddi_devid_t		vd_devid;
-	char			*vd_minor;
-	struct block_device	*vd_bdev;
-	krwlock_t		vd_lock;
-} vdev_disk_t;
-
 #endif /* _KERNEL */
 #endif /* _SYS_VDEV_DISK_H */
diff --git a/module/os/linux/zfs/vdev_disk.c b/module/os/linux/zfs/vdev_disk.c
index b514df3bc..5869b474d 100644
--- a/module/os/linux/zfs/vdev_disk.c
+++ b/module/os/linux/zfs/vdev_disk.c
@@ -37,6 +37,11 @@
 #include <linux/msdos_fs.h>
 #include <linux/vfs_compat.h>
 
+typedef struct vdev_disk {
+	struct block_device		*vd_bdev;
+	krwlock_t			vd_lock;
+} vdev_disk_t;
+
 /*
  * Unique identifier for the exclusive vdev holder.
  */
-- 
cgit v1.2.3