diff options
| author |   James Smart <james.smart@broadcom.com> | 2016-08-02 10:40:01 +0300 |
|---|---|---|
| committer |   Sagi Grimberg <sagi@grimberg.me> | 2016-09-23 15:37:37 -0700 |
| commit | 0fe51ff269da745078e0ab2b90dfdf2a58d6f3e7 (patch) | |
| tree | e66199ea634195b6fd24751d7a244076ac9ba65d /drivers/nvme | |
| parent | nbd: use BLK_MQ_F_BLOCKING (diff) | |
| download | linux-dev-0fe51ff269da745078e0ab2b90dfdf2a58d6f3e7.tar.xz linux-dev-0fe51ff269da745078e0ab2b90dfdf2a58d6f3e7.zip | |
nvme-fabrics: rework nvmf_get_address() for variable options
Revise nvmf_get_address() string to account for not all options being
present.
Signed-off-by: James Smart <james.smart@broadcom.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/fabrics.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index dc996761042f..2867b92cbdfb 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -109,8 +109,16 @@ static void nvmf_host_put(struct nvmf_host *host) */ int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size) { - return snprintf(buf, size, "traddr=%s,trsvcid=%s\n", - ctrl->opts->traddr, ctrl->opts->trsvcid); + int len = 0; + + if (ctrl->opts->mask & NVMF_OPT_TRADDR) + len += snprintf(buf, size, "traddr=%s", ctrl->opts->traddr); + if (ctrl->opts->mask & NVMF_OPT_TRSVCID) + len += snprintf(buf + len, size - len, "%strsvcid=%s", + (len) ? "," : "", ctrl->opts->trsvcid); + len += snprintf(buf + len, size - len, "\n"); + + return len; } EXPORT_SYMBOL_GPL(nvmf_get_address); |