ioctl: make IOCTL defines private

Don't expose these low level defines anymore. The library should provide
all necessary functions/helpers.

Signed-off-by: Daniel Wagner <[email protected]>

Author: igaw

libnvme/src/nvme/ioctl.h

@@ -135,17 +135,6 @@ struct nvme_uring_cmd {
 	__u32   rsvd2;
 };
 
-#define NVME_IOCTL_ID		_IO('N', 0x40)
-#define NVME_IOCTL_RESET	_IO('N', 0x44)
-#define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
-#define NVME_IOCTL_RESCAN	_IO('N', 0x46)
-
-/* io_uring async commands: */
-#define NVME_URING_CMD_IO	_IOWR('N', 0x80, struct nvme_uring_cmd)
-#define NVME_URING_CMD_IO_VEC	_IOWR('N', 0x81, struct nvme_uring_cmd)
-#define NVME_URING_CMD_ADMIN	_IOWR('N', 0x82, struct nvme_uring_cmd)
-#define NVME_URING_CMD_ADMIN_VEC _IOWR('N', 0x83, struct nvme_uring_cmd)
-
 #endif /* _UAPI_LINUX_NVME_IOCTL_H */
 
 #endif /* _LINUX_NVME_IOCTL_H */

libnvme/src/nvme/private.h

@@ -14,6 +14,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <ifaddrs.h>
 
 #include <nvme/fabrics.h>
@@ -69,11 +70,22 @@ struct linux_passthru_cmd64 {
 	__u64   result;
 };
 
+#define NVME_IOCTL_ID		_IO('N', 0x40)
+#define NVME_IOCTL_RESET	_IO('N', 0x44)
+#define NVME_IOCTL_SUBSYS_RESET	_IO('N', 0x45)
+#define NVME_IOCTL_RESCAN	_IO('N', 0x46)
+
 #define NVME_IOCTL_ADMIN_CMD	_IOWR('N', 0x41, struct linux_passthru_cmd32)
 #define NVME_IOCTL_IO_CMD	_IOWR('N', 0x43, struct linux_passthru_cmd32)
 #define NVME_IOCTL_ADMIN64_CMD  _IOWR('N', 0x47, struct linux_passthru_cmd64)
 #define NVME_IOCTL_IO64_CMD     _IOWR('N', 0x48, struct linux_passthru_cmd64)
 
+/* io_uring async commands: */
+#define NVME_URING_CMD_IO	_IOWR('N', 0x80, struct nvme_uring_cmd)
+#define NVME_URING_CMD_IO_VEC	_IOWR('N', 0x81, struct nvme_uring_cmd)
+#define NVME_URING_CMD_ADMIN	_IOWR('N', 0x82, struct nvme_uring_cmd)
+#define NVME_URING_CMD_ADMIN_VEC _IOWR('N', 0x83, struct nvme_uring_cmd)
+
 struct nvme_log {
 	int fd;
 	int level;