Remove nvme- prefix on files

We're already in the nvme-cli project, no need to namespace the files
further.

Signed-off-by: Keith Busch <kbusch@kernel.org>

diff --git a/Makefile b/Makefile
index 15385729b8d0a2c2f45fbfb57b7303e7a09a86e6..50c5392f94c04e6c70803847789e0e1facfc22b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ override CFLAGS += -DNVME_VERSION='"$(NVME_VERSION)"'
 
 NVME_DPKG_VERSION=1~`lsb_release -sc`
 
-OBJS := nvme-print.o nvme-lightnvm.o nvme-models.o plugin.o nvme-filters.o
+OBJS := print.o lightnvm.o models.o plugin.o filters.o
 
 UTIL_OBJS := util/argconfig.o util/suffix.o util/json.o util/parser.o
 
@@ -87,13 +87,13 @@ nvme: nvme.c nvme.h libnvme $(OBJS) $(PLUGIN_OBJS) $(UTIL_OBJS) NVME-VERSION-FIL
 verify-no-dep: nvme.c nvme.h $(OBJS) NVME-VERSION-FILE
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ $(OBJS) $(LDFLAGS)
 
-nvme.o: nvme.c nvme.h nvme-print.h util/argconfig.h util/suffix.h nvme-lightnvm.h fabrics.h
+nvme.o: nvme.c nvme.h print.h util/argconfig.h util/suffix.h lightnvm.h fabrics.h
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -c $< $(LDFLAGS)
 
-%.o: %.c %.h nvme.h nvme-print.h util/argconfig.h
+%.o: %.c %.h nvme.h print.h util/argconfig.h
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $< $(LDFLAGS)
 
-%.o: %.c nvme.h nvme-print.h util/argconfig.h
+%.o: %.c nvme.h print.h util/argconfig.h
        $(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) $(INC) -o $@ -c $< $(LDFLAGS)
 
 doc: $(NVME)

diff --git a/nvme-builtin.h b/builtin.h
similarity index 99%
rename from nvme-builtin.h
rename to builtin.h
index bfb907dff9ef9655c4598bfd077d9a66a103b64c..216c0a043118b28d74b343813f66c02fe8160d52 100644 (file)
--- a/nvme-builtin.h
+++ b/builtin.h
@@ -1,5 +1,5 @@
 #undef CMD_INC_FILE
-#define CMD_INC_FILE nvme-builtin
+#define CMD_INC_FILE builtin
 
 #if !defined(NVME_BUILTIN) || defined(CMD_HEADER_MULTI_READ)
 #define NVME_BUILTIN

diff --git a/libnvme b/libnvme
index 147f49f1261c055a84839fce0bc1eb50905a9044..6aa114f8a58222d38bfc9e083e804f1b50ad7401 160000 (submodule)
--- a/libnvme
+++ b/libnvme
@@ -1 +1 @@
-Subproject commit 147f49f1261c055a84839fce0bc1eb50905a9044
+Subproject commit 6aa114f8a58222d38bfc9e083e804f1b50ad7401

diff --git a/nvme-lightnvm.c b/lightnvm.c
similarity index 99%
rename from nvme-lightnvm.c
rename to lightnvm.c
index e757caf472f1981e76614ab5cae9a69f49c63799..c432473ad5073cfb731dd1c45856ec8fa1040c1a 100644 (file)
--- a/nvme-lightnvm.c
+++ b/lightnvm.c
@@ -30,8 +30,8 @@
 #include <errno.h>
 #include <inttypes.h>
 
-#include "nvme-lightnvm.h"
-#include "nvme-print.h"
+#include "lightnvm.h"
+#include "print.h"
 
 static int lnvm_open(void)
 {

diff --git a/nvme-lightnvm.h b/lightnvm.h
similarity index 100%
rename from nvme-lightnvm.h
rename to lightnvm.h

diff --git a/nvme-models.c b/models.c
similarity index 99%
rename from nvme-models.c
rename to models.c
index 9b5077d0cdbb066a5578d68e74e4c2de5150e306..67c89213146cb3d3e8cd589bde23294c08eeabde 100644 (file)
--- a/nvme-models.c
+++ b/models.c
@@ -7,7 +7,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include "nvme-models.h"
+#include "models.h"
 
 static char *_fmt1 = "/sys/class/nvme/nvme%d/device/subsystem_vendor";
 static char *_fmt2 = "/sys/class/nvme/nvme%d/device/subsystem_device";

diff --git a/nvme-models.h b/models.h
similarity index 100%
rename from nvme-models.h
rename to models.h

diff --git a/nvme-filters.c b/nvme-filters.c
deleted file mode 100644 (file)
index a4133f8..0000000
--- a/nvme-filters.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "nvme.h"
-
-/* global, used for controller specific namespace filter */
-int current_index;
-
-int scan_namespace_filter(const struct dirent *d)
-{
-       int i, n;
-
-       if (d->d_name[0] == '.')
-               return 0;
-
-       if (strstr(d->d_name, "nvme"))
-               if (sscanf(d->d_name, "nvme%dn%d", &i, &n) == 2)
-                       return 1;
-       return 0;
-}
-
-int scan_ctrl_paths_filter(const struct dirent *d)
-{
-       int id, cntlid, nsid;
-
-       if (d->d_name[0] == '.')
-               return 0;
-
-       if (strstr(d->d_name, "nvme")) {
-               if (sscanf(d->d_name, "nvme%dc%dn%d", &id, &cntlid, &nsid) == 3)
-                       return 1;
-               if (sscanf(d->d_name, "nvme%dn%d", &id, &nsid) == 2)
-                       return 1;
-       }
-
-       return 0;
-}
-
-int scan_ctrls_filter(const struct dirent *d)
-{
-       int id, nsid;
-
-       if (d->d_name[0] == '.')
-               return 0;
-
-       if (strstr(d->d_name, "nvme")) {
-               if (sscanf(d->d_name, "nvme%dn%d", &id, &nsid) == 2)
-                       return 0;
-               if (sscanf(d->d_name, "nvme%dn", &id) == 1)
-                       return 1;
-               return 0;
-       }
-
-       return 0;
-}
-
-int scan_subsys_filter(const struct dirent *d)
-{
-       int id;
-
-       if (d->d_name[0] == '.')
-               return 0;
-
-       if (strstr(d->d_name, "nvme-subsys")) {
-               if (sscanf(d->d_name, "nvme-subsys%d", &id) != 1)
-                       return 0;
-               return 1;
-       }
-
-       return 0;
-}
-
-int scan_dev_filter(const struct dirent *d)
-{
-       int ctrl, ns, part;
-
-       if (d->d_name[0] == '.')
-               return 0;
-
-       if (strstr(d->d_name, "nvme")) {
-               if (sscanf(d->d_name, "nvme%dn%dp%d", &ctrl, &ns, &part) == 3)
-                       return 0;
-               if (sscanf(d->d_name, "nvme%dn%d", &ctrl, &ns) == 2)
-                       return ctrl == current_index;
-       }
-       return 0;
-}

diff --git a/nvme.c b/nvme.c
index 1fe7840ef78889ac24dde5005c564a9c136c8cb4..11dafb7be484254052301a8ac887d631d143481d 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -28,7 +28,7 @@
 #include <uuid.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "argconfig.h"
 
@@ -37,7 +37,7 @@
 #define MAX_DISC_RETRIES       10
 
 #define CREATE_CMD
-#include "nvme-builtin.h"
+#include "builtin.h"
 
 #define ARRAY_SIZE(x) sizeof(x) / sizeof(*x)
 

diff --git a/plugins/dera/dera-nvme.c b/plugins/dera/dera-nvme.c
index 49b9bc72f7edc565db5d357e5ee9068f1879ebd2..a21f07b8f423e50312cdb98f215cba9d949c0698 100644 (file)
--- a/plugins/dera/dera-nvme.c
+++ b/plugins/dera/dera-nvme.c
@@ -10,7 +10,7 @@
 #include <sys/time.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 
 #include "argconfig.h"

diff --git a/plugins/huawei/huawei-nvme.c b/plugins/huawei/huawei-nvme.c
index e61a277efe826849aaece4a102286c1f0c51c489..497bb1fc804f5f52e9b167a4bb9d13cee5401066 100644 (file)
--- a/plugins/huawei/huawei-nvme.c
+++ b/plugins/huawei/huawei-nvme.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "json.h"
 

diff --git a/plugins/intel/intel-nvme.c b/plugins/intel/intel-nvme.c
index 0c4c0da3b0c81f6b8582575b76b69adbff225049..db4340d7ec69434610b2b245c10cb5a2f823bdd2 100644 (file)
--- a/plugins/intel/intel-nvme.c
+++ b/plugins/intel/intel-nvme.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "json.h"
 #include "plugin.h"
 

diff --git a/plugins/lnvm/lnvm-nvme.c b/plugins/lnvm/lnvm-nvme.c
index 3fad40c9cdfb28dfd3aeda5be51ca0f0d9f290bd..26a20720400b821bfce569482e13ad9f7d962a65 100644 (file)
--- a/plugins/lnvm/lnvm-nvme.c
+++ b/plugins/lnvm/lnvm-nvme.c
@@ -4,10 +4,10 @@
 #include <unistd.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 
-#include "nvme-lightnvm.h"
+#include "lightnvm.h"
 
 #include "argconfig.h"
 #include "suffix.h"

diff --git a/plugins/memblaze/memblaze-nvme.c b/plugins/memblaze/memblaze-nvme.c
index 906fb7225db4d1a3cee6a4c3faf39eed631011c4..754e3eaa63179c9ac4f6e89d371a1b7a54d30095 100644 (file)
--- a/plugins/memblaze/memblaze-nvme.c
+++ b/plugins/memblaze/memblaze-nvme.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 
 #include "argconfig.h"

diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
index 1c8ad99b1b3f4a21644f67a7435812e688aae3d2..000ab162195210dc484339fe210ae8fa190234e9 100644 (file)
--- a/plugins/micron/micron-nvme.c
+++ b/plugins/micron/micron-nvme.c
@@ -10,7 +10,7 @@
 #include <libgen.h>
 #include <sys/stat.h>
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include <sys/ioctl.h>
 #include <limits.h>
 

diff --git a/plugins/seagate/seagate-nvme.c b/plugins/seagate/seagate-nvme.c
index 998e1d72228fc92b546242e360e51985209fa8ce..a068ab3d5ca6f470646aef7b11414fbf47bca959 100644 (file)
--- a/plugins/seagate/seagate-nvme.c
+++ b/plugins/seagate/seagate-nvme.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "argconfig.h"
 #include "suffix.h"

diff --git a/plugins/shannon/shannon-nvme.c b/plugins/shannon/shannon-nvme.c
index 612a7292eb6d90ed4417962a5292881a7e9e1939..01c92390ab6df64d5efa9deb912f2f807ec2cb41 100644 (file)
--- a/plugins/shannon/shannon-nvme.c
+++ b/plugins/shannon/shannon-nvme.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "json.h"
 #include "plugin.h"
 

diff --git a/plugins/toshiba/toshiba-nvme.c b/plugins/toshiba/toshiba-nvme.c
index 0966e8c000e91a44f746163bf7c932b569db14ce..7d1084fdb4a0da23464253d80549daed76da637f 100644 (file)
--- a/plugins/toshiba/toshiba-nvme.c
+++ b/plugins/toshiba/toshiba-nvme.c
@@ -8,7 +8,7 @@
 #include <stdbool.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "argconfig.h"
 #include "suffix.h"

diff --git a/plugins/virtium/virtium-nvme.c b/plugins/virtium/virtium-nvme.c
index 8c7923d5682d3b872f0e7a776bab186f858de6ce..9cf193c4a9166796800d2800ac95bf7070884416 100644 (file)
--- a/plugins/virtium/virtium-nvme.c
+++ b/plugins/virtium/virtium-nvme.c
@@ -10,7 +10,7 @@
 #include <locale.h>
 
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "argconfig.h"
 #include "suffix.h"

diff --git a/plugins/wdc/wdc-nvme.c b/plugins/wdc/wdc-nvme.c
index 5d42c47a60f0d46f64aabef87ccb9070ac60910a..875f79c797bcd490768b751cc2d5c5ea9704064d 100644 (file)
--- a/plugins/wdc/wdc-nvme.c
+++ b/plugins/wdc/wdc-nvme.c
@@ -31,7 +31,7 @@
 
 #include "common.h"
 #include "nvme.h"
-#include "nvme-print.h"
+#include "print.h"
 #include "plugin.h"
 #include "json.h"
 

diff --git a/nvme-print.c b/print.c
similarity index 99%
rename from nvme-print.c
rename to print.c
index 93b96614710de5268e52413b48d6640b4e312a34..5d6d53aba4b69c999447c356bc898d2115500d27 100644 (file)
--- a/nvme-print.c
+++ b/print.c
@@ -7,9 +7,9 @@
 
 #include <uuid/uuid.h>
 
-#include "nvme-print.h"
+#include "print.h"
+#include "models.h"
 #include "util/json.h"
-#include "nvme-models.h"
 #include "util/suffix.h"
 #include "common.h"
 

diff --git a/nvme-print.h b/print.h
similarity index 100%
rename from nvme-print.h
rename to print.h