src: use standard lookup for libnvme include

igaw · igaw · commit 36a20972ec71 · 2026-02-27T10:42:18.000+01:00
The libnvme.h header is not a local header file, thus use the standard
lookup &lt;&gt; for external headers.

Signed-off-by: Daniel Wagner &lt;wagi@kernel.org&gt;
diff --git a/nvme-print-json.c b/nvme-print-json.c
@@ -8,13 +8,14 @@
 #include <arpa/inet.h>
 #include <ccan/compiler/compiler.h>
 
+#include <libnvme.h>
+
 #include "nvme-print.h"
 
 #include "util/json.h"
 #include "logging.h"
 #include "nvme.h"
 #include "common.h"
-#include "libnvme.h"
 
 #define ERROR_MSG_LEN 100
 #define NAME_LEN 128
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
@@ -14,8 +14,9 @@
 #include <ccan/htable/htable.h>
 #include <ccan/hash/hash.h>
 
+#include <libnvme.h>
+
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 #include "nvme-models.h"
 #include "util/suffix.h"
diff --git a/nvme-print.c b/nvme-print.c
@@ -8,8 +8,9 @@
 #include <sys/stat.h>
 #include <locale.h>
 
+#include <libnvme.h>
+
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 #include "nvme-models.h"
 #include "util/suffix.h"
diff --git a/nvme-rpmb.c b/nvme-rpmb.c
@@ -29,9 +29,10 @@
 #include <linux/socket.h>
 #include <limits.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 
 #define CREATE_CMD
diff --git a/plugins/amzn/amzn-nvme.c b/plugins/amzn/amzn-nvme.c
@@ -6,9 +6,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "nvme-print.h"
 
diff --git a/plugins/dapustor/dapustor-nvme.c b/plugins/dapustor/dapustor-nvme.c
@@ -11,9 +11,10 @@
 
 #include <sys/stat.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "nvme-print.h"
 
diff --git a/plugins/dell/dell-nvme.c b/plugins/dell/dell-nvme.c
@@ -7,9 +7,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 
 #define CREATE_CMD
diff --git a/plugins/dera/dera-nvme.c b/plugins/dera/dera-nvme.c
@@ -10,8 +10,9 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
+#include <libnvme.h>
+
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/fdp/fdp.c b/plugins/fdp/fdp.c
@@ -9,9 +9,10 @@
 #include <linux/fs.h>
 #include <sys/stat.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 
 #define CREATE_CMD
diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
@@ -27,9 +27,10 @@
 
 #include <sys/stat.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 
 #include "util/suffix.h"
diff --git a/plugins/innogrit/innogrit-nvme.c b/plugins/innogrit/innogrit-nvme.c
@@ -7,9 +7,10 @@
 #include <sys/stat.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 #include "typedef.h"
 #include "util/cleanup.h"
diff --git a/plugins/inspur/inspur-nvme.c b/plugins/inspur/inspur-nvme.c
@@ -10,9 +10,10 @@
 #include <dirent.h>
 #include <sys/stat.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "nvme-print.h"
 #include "util/suffix.h"
diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
@@ -6,9 +6,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/lm/lm-nvme.c b/plugins/lm/lm-nvme.c
@@ -23,10 +23,11 @@
 #include <dirent.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
 #include "nvme-print.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "util/cleanup.h"
diff --git a/plugins/lm/lm-print.h b/plugins/lm/lm-print.h
@@ -2,8 +2,9 @@
 #ifndef LM_PRINT_H
 #define LM_PRINT_H
 
+#include <libnvme.h>
+
 #include "nvme.h"
-#include "libnvme.h"
 
 struct lm_print_ops {
 	void (*controller_state_data)(struct nvme_lm_controller_state_data *data, size_t len,
diff --git a/plugins/mangoboost/mangoboost-nvme.c b/plugins/mangoboost/mangoboost-nvme.c
@@ -12,9 +12,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 
 #define CREATE_CMD
diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
@@ -7,9 +7,10 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "nvme.h"
 #include "common.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
@@ -23,9 +23,11 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include <limits.h>
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/nbft/nbft-plugin.c b/plugins/nbft/nbft-plugin.c
@@ -5,6 +5,7 @@
 #include <fnmatch.h>
 
 #include <libnvme.h>
+
 #include "nvme-print.h"
 #include "nvme.h"
 #include "fabrics.h"
diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
@@ -24,9 +24,10 @@
 #include <string.h>
 #include <libgen.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 
 #include "util/suffix.h"
 
diff --git a/plugins/nvidia/nvidia-nvme.c b/plugins/nvidia/nvidia-nvme.c
@@ -6,9 +6,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 
 #define CREATE_CMD
diff --git a/plugins/ocp/ocp-fw-activation-history.h b/plugins/ocp/ocp-fw-activation-history.h
@@ -5,6 +5,7 @@
  * Authors: karl.dedow@solidigm.com
  */
 #include <libnvme.h>
+
 #include "common.h"
 #include "linux/types.h"
 
diff --git a/plugins/ocp/ocp-nvme.c b/plugins/ocp/ocp-nvme.c
@@ -16,9 +16,10 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "util/types.h"
diff --git a/plugins/ocp/ocp-telemetry-decode.c b/plugins/ocp/ocp-telemetry-decode.c
@@ -3,10 +3,10 @@
  *
  * Authors: Jeff Lien <jeff.lien@wdc.com>,
  */
+#include <libnvme.h>
 
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "util/types.h"
diff --git a/plugins/sandisk/sandisk-nvme.c b/plugins/sandisk/sandisk-nvme.c
@@ -14,9 +14,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "util/cleanup.h"
diff --git a/plugins/sandisk/sandisk-utils.c b/plugins/sandisk/sandisk-utils.c
@@ -11,9 +11,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <time.h>
+
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 #include "sandisk-utils.h"
 #include "plugins/wdc/wdc-nvme-cmds.h"
diff --git a/plugins/scaleflux/sfx-nvme.c b/plugins/scaleflux/sfx-nvme.c
@@ -14,9 +14,10 @@
 #include <dirent.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c
@@ -32,9 +32,10 @@
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/sed/sed.c b/plugins/sed/sed.c
@@ -9,9 +9,10 @@
 #include <linux/fs.h>
 #include <sys/stat.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "nvme-print.h"
 #include "sedopal_cmd.h"
 #include <linux/sed-opal.h>
diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c
@@ -5,10 +5,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <inttypes.h>
+#include <libnvme.h>
 
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/solidigm/solidigm-garbage-collection.c b/plugins/solidigm/solidigm-garbage-collection.c
@@ -12,9 +12,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/solidigm/solidigm-internal-logs.c b/plugins/solidigm/solidigm-internal-logs.c
@@ -15,9 +15,10 @@
 #include <inttypes.h>
 #include <time.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "nvme-print.h"
 #include "solidigm-util.h"
diff --git a/plugins/solidigm/solidigm-latency-tracking.c b/plugins/solidigm/solidigm-latency-tracking.c
@@ -11,9 +11,10 @@
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "common.h"
 #include "nvme.h"
-#include "libnvme.h"
 #include "plugin.h"
 #include "linux/types.h"
 #include "nvme-print.h"
diff --git a/plugins/solidigm/solidigm-market-log.c b/plugins/solidigm/solidigm-market-log.c
diff --git a/plugins/solidigm/solidigm-smart.c b/plugins/solidigm/solidigm-smart.c
diff --git a/plugins/solidigm/solidigm-telemetry.c b/plugins/solidigm/solidigm-telemetry.c
diff --git a/plugins/solidigm/solidigm-telemetry/telemetry-log.h b/plugins/solidigm/solidigm-telemetry/telemetry-log.h
diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c
diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c
diff --git a/plugins/transcend/transcend-nvme.c b/plugins/transcend/transcend-nvme.c
diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c
diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
diff --git a/plugins/wdc/wdc-utils.c b/plugins/wdc/wdc-utils.c
diff --git a/plugins/ymtc/ymtc-nvme.c b/plugins/ymtc/ymtc-nvme.c
diff --git a/plugins/zns/zns.c b/plugins/zns/zns.c
