From 6bd93f475cd26ea849a22c1c96dc99557174fe83 Mon Sep 17 00:00:00 2001
From: Eduard Shishkin <edward6@linux.ibm.com>
Date: Tue, 22 Nov 2022 11:15:05 +0100
Subject: [PATCH] Clean up of libdasd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove standalone IOCTLs definitions and use sys/mount.h instead

Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
Reviewed-by: Jan Hoeppner <hoeppner@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 include/lib/dasd_base.h | 12 ------------
 libdasd/dasd_ioctl.c    |  1 +
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/lib/dasd_base.h b/include/lib/dasd_base.h
index 400e3747..bc7fd306 100644
--- a/include/lib/dasd_base.h
+++ b/include/lib/dasd_base.h
@@ -292,18 +292,6 @@ struct hd_geometry {
 /* Check device format according to format_data_t */
 #define BIODASDCHECKFMT _IOWR(DASD_IOCTL_LETTER, 2, format_check_t)
 
-/********************************************************************************
- * SECTION: Further IOCTL Definitions  (see fs.h and hdreq.h)
- *******************************************************************************/
-/* get read-only status (0 = read_write) */
-#define BLKROGET   _IO(0x12, 94)
-/* re-read partition table */
-#define BLKRRPART  _IO(0x12, 95)
-/* get block device sector size */
-#define BLKSSZGET  _IO(0x12, 104)
-/* return device size in bytes (u64 *arg) */
-#define BLKGETSIZE64 _IOR(0x12, 114, size_t)
-
 #ifndef __linux__ /* from <linux/hdreg.h> */
 #define HDIO_GETGEO	0x0301
 #endif
diff --git a/libdasd/dasd_ioctl.c b/libdasd/dasd_ioctl.c
index f6847618..a9d0f237 100644
--- a/libdasd/dasd_ioctl.c
+++ b/libdasd/dasd_ioctl.c
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/mount.h>
 #include <unistd.h>
 #include <string.h>