Commit 45e2f3c2 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Jens Axboe

nvmet: add generic type-name mapping

This patch adds a new type to name mapping generic structure. It
replaces nvmet_transport_name with new generic mapping structure
nvmet_transport.
Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7890b970
...@@ -20,10 +20,12 @@ static const struct config_item_type nvmet_subsys_type; ...@@ -20,10 +20,12 @@ static const struct config_item_type nvmet_subsys_type;
static LIST_HEAD(nvmet_ports_list); static LIST_HEAD(nvmet_ports_list);
struct list_head *nvmet_ports = &nvmet_ports_list; struct list_head *nvmet_ports = &nvmet_ports_list;
static const struct nvmet_transport_name { struct nvmet_type_name_map {
u8 type; u8 type;
const char *name; const char *name;
} nvmet_transport_names[] = { };
static struct nvmet_type_name_map nvmet_transport[] = {
{ NVMF_TRTYPE_RDMA, "rdma" }, { NVMF_TRTYPE_RDMA, "rdma" },
{ NVMF_TRTYPE_FC, "fc" }, { NVMF_TRTYPE_FC, "fc" },
{ NVMF_TRTYPE_TCP, "tcp" }, { NVMF_TRTYPE_TCP, "tcp" },
...@@ -254,10 +256,9 @@ static ssize_t nvmet_addr_trtype_show(struct config_item *item, ...@@ -254,10 +256,9 @@ static ssize_t nvmet_addr_trtype_show(struct config_item *item,
struct nvmet_port *port = to_nvmet_port(item); struct nvmet_port *port = to_nvmet_port(item);
int i; int i;
for (i = 0; i < ARRAY_SIZE(nvmet_transport_names); i++) { for (i = 0; i < ARRAY_SIZE(nvmet_transport); i++) {
if (port->disc_addr.trtype != nvmet_transport_names[i].type) if (port->disc_addr.trtype == nvmet_transport[i].type)
continue; return sprintf(page, "%s\n", nvmet_transport[i].name);
return sprintf(page, "%s\n", nvmet_transport_names[i].name);
} }
return sprintf(page, "\n"); return sprintf(page, "\n");
...@@ -282,8 +283,8 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item, ...@@ -282,8 +283,8 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item,
return -EACCES; return -EACCES;
} }
for (i = 0; i < ARRAY_SIZE(nvmet_transport_names); i++) { for (i = 0; i < ARRAY_SIZE(nvmet_transport); i++) {
if (sysfs_streq(page, nvmet_transport_names[i].name)) if (sysfs_streq(page, nvmet_transport[i].name))
goto found; goto found;
} }
...@@ -291,7 +292,7 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item, ...@@ -291,7 +292,7 @@ static ssize_t nvmet_addr_trtype_store(struct config_item *item,
return -EINVAL; return -EINVAL;
found: found:
memset(&port->disc_addr.tsas, 0, NVMF_TSAS_SIZE); memset(&port->disc_addr.tsas, 0, NVMF_TSAS_SIZE);
port->disc_addr.trtype = nvmet_transport_names[i].type; port->disc_addr.trtype = nvmet_transport[i].type;
if (port->disc_addr.trtype == NVMF_TRTYPE_RDMA) if (port->disc_addr.trtype == NVMF_TRTYPE_RDMA)
nvmet_port_init_tsas_rdma(port); nvmet_port_init_tsas_rdma(port);
return count; return count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment