Commit 913bd6b6 authored by Maciej Szwed's avatar Maciej Szwed Committed by Ben Walker
Browse files

bdev/nvme: Remove spdk_bdev_nvme_lookup_ctrlr function 



spdk_bdev_nvme_lookup_ctrlr can be replaced with existing
nvme_bdev_ctrlr_get_by_name function.

Signed-off-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Change-Id: Id85243b13099b2976e1368e481201ccf27ce6ddb

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446437


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent d5565d6b

lib/bdev/nvme/bdev_nvme.c

+0 −14
Original line number Diff line number Diff line
@@ -150,20 +150,6 @@ spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch) 
	return nvme_ch->qpair;

}



struct nvme_bdev_ctrlr *

spdk_bdev_nvme_lookup_ctrlr(const char *ctrlr_name)

{

	struct nvme_bdev_ctrlr *_nvme_ctrlr;



	TAILQ_FOREACH(_nvme_ctrlr, &g_nvme_bdev_ctrlrs, tailq) {

		if (strcmp(ctrlr_name, _nvme_ctrlr->name) == 0) {

			return _nvme_ctrlr;

		}

	}



	return NULL;

}



struct nvme_bdev_ctrlr *

spdk_bdev_nvme_first_ctrlr(void)

{

lib/bdev/nvme/bdev_nvme.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ void spdk_bdev_nvme_dump_trid_json(struct spdk_nvme_transport_id *trid, 
				   struct spdk_json_write_ctx *w);



struct spdk_nvme_qpair *spdk_bdev_nvme_get_io_qpair(struct spdk_io_channel *ctrlr_io_ch);

struct nvme_bdev_ctrlr *spdk_bdev_nvme_lookup_ctrlr(const char *ctrlr_name);

struct nvme_bdev_ctrlr *spdk_bdev_nvme_first_ctrlr(void);

struct nvme_bdev_ctrlr *spdk_bdev_nvme_next_ctrlr(struct nvme_bdev_ctrlr *prev);

void spdk_bdev_nvme_get_opts(struct spdk_bdev_nvme_opts *opts);

lib/bdev/nvme/bdev_nvme_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ spdk_rpc_get_nvme_controllers(struct spdk_jsonrpc_request *request, 
	}



	if (req.name) {

		ctrlr = spdk_bdev_nvme_lookup_ctrlr(req.name);

		ctrlr = nvme_bdev_ctrlr_get_by_name(req.name);

		if (ctrlr == NULL) {

			SPDK_ERRLOG("ctrlr '%s' does not exist\n", req.name);

			goto invalid;

lib/bdev/nvme/nvme_rpc.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ spdk_rpc_send_nvme_cmd(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	ctx->nvme_bdev_ctrlr = spdk_bdev_nvme_lookup_ctrlr(ctx->req.name);

	ctx->nvme_bdev_ctrlr = nvme_bdev_ctrlr_get_by_name(ctx->req.name);

	if (ctx->nvme_bdev_ctrlr == NULL) {

		SPDK_ERRLOG("Failed at device lookup\n");

		error_code = SPDK_JSONRPC_ERROR_INVALID_PARAMS;