From c9545422b248ea5342ce4a6f917066b478d960c5 Mon Sep 17 00:00:00 2001 From: Sagi Grimberg Date: Wed, 1 Apr 2020 14:53:43 -0700 Subject: [PATCH] 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 --- fabrics.c | 8 ++++---- fabrics.h | 8 ++++---- nvme.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fabrics.c b/fabrics.c index 7b2d151..372bc1d 100644 --- 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 b8e53f4..f5b8eaf 100644 --- 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 903cffc..46341a6 100644 --- 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) -- 2.49.0