From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Nicholas A. Bellinger" Subject: [RFC 1/2] nvme-fabrics: Add nvmf_get_default_host helper Date: Wed, 8 Jun 2016 03:34:20 +0000 Message-ID: <1465356861-4321-2-git-send-email-nab@linux-iscsi.org> References: <1465356861-4321-1-git-send-email-nab@linux-iscsi.org> Return-path: In-Reply-To: <1465356861-4321-1-git-send-email-nab@linux-iscsi.org> Sender: target-devel-owner@vger.kernel.org To: target-devel Cc: linux-scsi , linux-nvme , Jens Axboe , Christoph Hellwig , Keith Busch , Jay Freyensee , Martin Petersen , Sagi Grimberg , Hannes Reinecke , Mike Christie , Dave B Minturn , Nicholas Bellinger List-Id: linux-scsi@vger.kernel.org From: Nicholas Bellinger This patch adds a nvmf_get_default_host() helper used to setup nvmf_ctrl_options->host to internal nvmf_default_host reference, following existing nvmf_parse_options() code. Note it's required for nvme-loop multi-controller support, in order to drive nvmet_port creation directly via configfs attribute write from in ../nvmet/subsystems/$NQN/ports/$PORT/ group context. Cc: Jens Axboe Cc: Christoph Hellwig Cc: Keith Busch Cc: Jay Freyensee Cc: Martin Petersen Cc: Sagi Grimberg Cc: Hannes Reinecke Cc: Mike Christie Signed-off-by: Nicholas Bellinger --- drivers/nvme/host/fabrics.c | 13 +++++++++++-- drivers/nvme/host/fabrics.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c index ee4b7f1..04317be 100644 --- a/drivers/nvme/host/fabrics.c +++ b/drivers/nvme/host/fabrics.c @@ -497,6 +497,16 @@ static struct nvmf_transport_ops *nvmf_lookup_transport( return NULL; } +void nvmf_get_default_host(struct nvmf_ctrl_options *opts) +{ + if (opts->host) + return; + + kref_get(&nvmf_default_host->ref); + opts->host = nvmf_default_host; +} +EXPORT_SYMBOL_GPL(nvmf_get_default_host); + static const match_table_t opt_tokens = { { NVMF_OPT_TRANSPORT, "transport=%s" }, { NVMF_OPT_TRADDR, "traddr=%s" }, @@ -686,8 +696,7 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, } if (!opts->host) { - kref_get(&nvmf_default_host->ref); - opts->host = nvmf_default_host; + nvmf_get_default_host(opts); } out: diff --git a/drivers/nvme/host/fabrics.h b/drivers/nvme/host/fabrics.h index b540674..73ef7a7 100644 --- a/drivers/nvme/host/fabrics.h +++ b/drivers/nvme/host/fabrics.h @@ -128,6 +128,7 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl); int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid); void nvmf_register_transport(struct nvmf_transport_ops *ops); void nvmf_unregister_transport(struct nvmf_transport_ops *ops); +void nvmf_get_default_host(struct nvmf_ctrl_options *opts); void nvmf_free_options(struct nvmf_ctrl_options *opts); const char *nvmf_get_subsysnqn(struct nvme_ctrl *ctrl); int nvmf_get_address(struct nvme_ctrl *ctrl, char *buf, int size); -- 1.9.1