File 0060-Use-sys-ioctl.h-to-pull-in-definitions.patch of Package nvme-cli

Overview Repositories Revisions Requests Users Attributes Meta

File 0060-Use-sys-ioctl.h-to-pull-in-definitions.patch of Package nvme-cli (Revision ae92a91306e7a3b1140279fd37e16eea)

Currently displaying revision ae92a91306e7a3b1140279fd37e16eea , Show latest

From d72ccb0bc9e4de090a6d296c51c56d4cd23b4ba2 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@bsdimp.com>
Date: Wed, 3 Oct 2018 23:18:38 -0600
Subject: [PATCH] Use sys/ioctl.h to pull in definitions.

_IO* are part of the ioctl intereface, so use the more portable
sys/ioctl.h to get the definitions. Eliminate all uses of linux/fs.h
that were needed only for this.
---
 intel-nvme.c       | 1 -
 linux/nvme_ioctl.h | 1 +
 memblaze-nvme.c    | 1 -
 seagate-nvme.c     | 1 -
 toshiba-nvme.c     | 1 -
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/intel-nvme.c b/intel-nvme.c
index e65ed4a..2b487dc 100644
--- a/intel-nvme.c
+++ b/intel-nvme.c
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <linux/fs.h>
 #include <inttypes.h>
 #include <asm/byteorder.h>
 
diff --git a/linux/nvme_ioctl.h b/linux/nvme_ioctl.h
index 50ff21f..d25a532 100644
--- a/linux/nvme_ioctl.h
+++ b/linux/nvme_ioctl.h
@@ -16,6 +16,7 @@
 #define _UAPI_LINUX_NVME_IOCTL_H
 
 #include <linux/types.h>
+#include <sys/ioctl.h>
 
 struct nvme_user_io {
 	__u8	opcode;
diff --git a/memblaze-nvme.c b/memblaze-nvme.c
index 471f31c..b30c653 100644
--- a/memblaze-nvme.c
+++ b/memblaze-nvme.c
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <linux/fs.h>
 
 #include "linux/nvme_ioctl.h"
 
diff --git a/seagate-nvme.c b/seagate-nvme.c
index f8fc5c7..10c688e 100755
--- a/seagate-nvme.c
+++ b/seagate-nvme.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <linux/fs.h>
 #include <inttypes.h>
 #include <asm/byteorder.h>
 #include <sys/ioctl.h>
diff --git a/toshiba-nvme.c b/toshiba-nvme.c
index 116c8a0..a22a4d6 100644
--- a/toshiba-nvme.c
+++ b/toshiba-nvme.c
@@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <linux/fs.h>
 #include <stddef.h>
 #include <inttypes.h>
 #include <stdbool.h>
-- 
2.13.7

Places

File 0060-Use-sys-ioctl.h-to-pull-in-definitions.patch of Package nvme-cli (Revision ae92a91306e7a3b1140279fd37e16eea)

Places