From 6e8b6aea2827a4dd26be8bd86f627ec214041243 Mon Sep 17 00:00:00 2001 From: GangCao Date: Tue, 21 Feb 2017 12:49:59 +0800 Subject: [PATCH] app/nvmf_tgt: rename spdk_nvmf_parse_subsystem_for_rpc Change-Id: Ie07b8e593b757bcd1c796a2892292bffce2b77d7 Signed-off-by: GangCao --- app/nvmf_tgt/conf.c | 20 ++++++++++---------- app/nvmf_tgt/nvmf_rpc.c | 12 ++++++------ app/nvmf_tgt/nvmf_tgt.h | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/nvmf_tgt/conf.c b/app/nvmf_tgt/conf.c index 283444b5e..23bd2378a 100644 --- a/app/nvmf_tgt/conf.c +++ b/app/nvmf_tgt/conf.c @@ -394,11 +394,11 @@ spdk_nvmf_parse_subsystem(struct spdk_conf_section *sp) num_devs++; } - return spdk_nvmf_parse_subsystem_for_rpc(nqn, mode_str, lcore, - num_listen_addrs, listen_addrs, - num_hosts, hosts, - bdf, sn, - num_devs, devs); + return spdk_nvmf_construct_subsystem(nqn, mode_str, lcore, + num_listen_addrs, listen_addrs, + num_hosts, hosts, + bdf, sn, + num_devs, devs); } static int @@ -441,11 +441,11 @@ spdk_nvmf_parse_conf(void) } int -spdk_nvmf_parse_subsystem_for_rpc(const char *name, - const char *mode_str, int32_t lcore, - int num_listen_addresses, struct rpc_listen_address *addresses, - int num_hosts, char *hosts[], const char *bdf, - const char *sn, int num_devs, char *dev_list[]) +spdk_nvmf_construct_subsystem(const char *name, + const char *mode_str, int32_t lcore, + int num_listen_addresses, struct rpc_listen_address *addresses, + int num_hosts, char *hosts[], const char *bdf, + const char *sn, int num_devs, char *dev_list[]) { struct spdk_nvmf_subsystem *subsystem; struct nvmf_tgt_subsystem *app_subsys; diff --git a/app/nvmf_tgt/nvmf_rpc.c b/app/nvmf_tgt/nvmf_rpc.c index eab3cf9b4..0666b5a5a 100644 --- a/app/nvmf_tgt/nvmf_rpc.c +++ b/app/nvmf_tgt/nvmf_rpc.c @@ -303,12 +303,12 @@ spdk_rpc_construct_nvmf_subsystem(struct spdk_jsonrpc_server_conn *conn, goto invalid; } - ret = spdk_nvmf_parse_subsystem_for_rpc(req.nqn, req.mode, req.core, - req.listen_addresses.num_listen_address, - req.listen_addresses.addresses, - req.hosts.num_hosts, req.hosts.hosts, req.pci_address, - req.serial_number, - req.namespaces.num_names, req.namespaces.names); + ret = spdk_nvmf_construct_subsystem(req.nqn, req.mode, req.core, + req.listen_addresses.num_listen_address, + req.listen_addresses.addresses, + req.hosts.num_hosts, req.hosts.hosts, req.pci_address, + req.serial_number, + req.namespaces.num_names, req.namespaces.names); if (ret) { goto invalid; } diff --git a/app/nvmf_tgt/nvmf_tgt.h b/app/nvmf_tgt/nvmf_tgt.h index bfe1360ab..936d0667b 100644 --- a/app/nvmf_tgt/nvmf_tgt.h +++ b/app/nvmf_tgt/nvmf_tgt.h @@ -77,11 +77,11 @@ struct nvmf_tgt_subsystem *nvmf_tgt_create_subsystem(const char *name, uint32_t lcore); int -spdk_nvmf_parse_subsystem_for_rpc(const char *name, - const char *mode, int32_t lcore, - int num_listen_addresses, struct rpc_listen_address *addresses, - int num_hosts, char *hosts[], const char *bdf, - const char *sn, int num_devs, char *dev_list[]); +spdk_nvmf_construct_subsystem(const char *name, + const char *mode, int32_t lcore, + int num_listen_addresses, struct rpc_listen_address *addresses, + int num_hosts, char *hosts[], const char *bdf, + const char *sn, int num_devs, char *dev_list[]); int nvmf_tgt_shutdown_subsystem_by_nqn(const char *nqn);