fabrics: add fabrics_ prefix to fabrics operations

discover/connect/disconnect are generic names which might
clash with other external included libraries.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/fabrics.c b/fabrics.c
index 7b2d151cdbd455b59ff40b0fd217cef038775e17..372bc1dd3ce83616ad2cfc7905034a8c9e1a1237 100644 (file)
--- a/fabrics.c
+++ b/fabrics.c
@@ -1250,7 +1250,7 @@ out:
        return ret;
 }
 
-int discover(const char *desc, int argc, char **argv, bool connect)
+int fabrics_discover(const char *desc, int argc, char **argv, bool connect)
 {
        char argstr[BUF_SIZE];
        int ret;
@@ -1305,7 +1305,7 @@ out:
        return nvme_status_to_errno(ret, true);
 }
 
-int connect(const char *desc, int argc, char **argv)
+int fabrics_connect(const char *desc, int argc, char **argv)
 {
        char argstr[BUF_SIZE];
        int instance, ret;
@@ -1438,7 +1438,7 @@ static int disconnect_by_device(char *device)
        return remove_ctrl(instance);
 }
 
-int disconnect(const char *desc, int argc, char **argv)
+int fabrics_disconnect(const char *desc, int argc, char **argv)
 {
        const char *nqn = "nqn name";
        const char *device = "nvme device";
@@ -1483,7 +1483,7 @@ out:
        return nvme_status_to_errno(ret, true);
 }
 
-int disconnect_all(const char *desc, int argc, char **argv)
+int fabrics_disconnect_all(const char *desc, int argc, char **argv)
 {
        struct nvme_topology t = { };
        int i, j, err;

diff --git a/fabrics.h b/fabrics.h
index b8e53f492b5303a93b656c89081815fd5cedfd55..f5b8eaf6bba0d8a85c06c956521ac33b28adfeb5 100644 (file)
--- a/fabrics.h
+++ b/fabrics.h
@@ -5,9 +5,9 @@
 
 extern char *hostnqn_read(void);
 
-extern int discover(const char *desc, int argc, char **argv, bool connect);
-extern int connect(const char *desc, int argc, char **argv);
-extern int disconnect(const char *desc, int argc, char **argv);
-extern int disconnect_all(const char *desc, int argc, char **argv);
+extern int fabrics_discover(const char *desc, int argc, char **argv, bool connect);
+extern int fabrics_connect(const char *desc, int argc, char **argv);
+extern int fabrics_disconnect(const char *desc, int argc, char **argv);
+extern int fabrics_disconnect_all(const char *desc, int argc, char **argv);
 
 #endif

diff --git a/nvme.c b/nvme.c
index 903cffcfa6bc404fd5b36a8e3e23caeff5ede60e..46341a64737ad25d6227002934954d1d5b735f25 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -4776,31 +4776,31 @@ static int show_hostnqn_cmd(int argc, char **argv, struct command *command, stru
 static int discover_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
 {
        const char *desc = "Send Get Log Page request to Discovery Controller.";
-       return discover(desc, argc, argv, false);
+       return fabrics_discover(desc, argc, argv, false);
 }
 
 static int connect_all_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
 {
        const char *desc = "Discover NVMeoF subsystems and connect to them";
-       return discover(desc, argc, argv, true);
+       return fabrics_discover(desc, argc, argv, true);
 }
 
 static int connect_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
 {
        const char *desc = "Connect to NVMeoF subsystem";
-       return connect(desc, argc, argv);
+       return fabrics_connect(desc, argc, argv);
 }
 
 static int disconnect_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
 {
        const char *desc = "Disconnect from NVMeoF subsystem";
-       return disconnect(desc, argc, argv);
+       return fabrics_disconnect(desc, argc, argv);
 }
 
 static int disconnect_all_cmd(int argc, char **argv, struct command *command, struct plugin *plugin)
 {
        const char *desc = "Disconnect from all connected NVMeoF subsystems";
-       return disconnect_all(desc, argc, argv);
+       return fabrics_disconnect_all(desc, argc, argv);
 }
 
 void register_extension(struct plugin *plugin)