Commit 9cb21ad6 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

lib/nvmf: remove spdk prefix from functions in nvmf_internal.h 



Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: I9b8d15b52754477c5d120f8d96e0e2c329a32e0c
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2292


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 5802b8e5

lib/nvmf/ctrlr.c

+52 −52
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ _spdk_nvmf_ctrlr_disconnect_qpairs_on_pg(struct spdk_io_channel_iter *i, bool in 
	group = spdk_io_channel_get_ctx(ch);



	TAILQ_FOREACH_SAFE(qpair, &group->qpairs, link, temp_qpair) {

		if (qpair->ctrlr == ctrlr && (include_admin || !spdk_nvmf_qpair_is_admin_queue(qpair))) {

		if (qpair->ctrlr == ctrlr && (include_admin || !nvmf_qpair_is_admin_queue(qpair))) {

			rc = spdk_nvmf_qpair_disconnect(qpair, NULL, NULL);

			if (rc) {

				SPDK_ERRLOG("Qpair disconnect failed\n");
@@ -263,7 +263,7 @@ _spdk_nvmf_subsystem_add_ctrlr(void *ctx) 
	struct spdk_nvmf_fabric_connect_rsp *rsp = &req->rsp->connect_rsp;

	struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;



	if (spdk_nvmf_subsystem_add_ctrlr(ctrlr->subsys, ctrlr)) {

	if (nvmf_subsystem_add_ctrlr(ctrlr->subsys, ctrlr)) {

		SPDK_ERRLOG("Unable to add controller to subsystem\n");

		spdk_bit_array_free(&ctrlr->qpair_mask);

		free(ctrlr);
@@ -396,9 +396,9 @@ _spdk_nvmf_ctrlr_destruct(void *ctx) 
}



void

spdk_nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_destruct(struct spdk_nvmf_ctrlr *ctrlr)

{

	spdk_nvmf_subsystem_remove_ctrlr(ctrlr->subsys, ctrlr);

	nvmf_subsystem_remove_ctrlr(ctrlr->subsys, ctrlr);



	spdk_thread_send_msg(ctrlr->thread, _spdk_nvmf_ctrlr_destruct, ctrlr);

}
@@ -465,7 +465,7 @@ _spdk_nvmf_ctrlr_add_io_qpair(void *ctx) 
	/* We already checked this in spdk_nvmf_ctrlr_connect */

	assert(subsystem != NULL);



	ctrlr = spdk_nvmf_subsystem_get_ctrlr(subsystem, data->cntlid);

	ctrlr = nvmf_subsystem_get_ctrlr(subsystem, data->cntlid);

	if (ctrlr == NULL) {

		SPDK_ERRLOG("Unknown controller ID 0x%x\n", data->cntlid);

		SPDK_NVMF_INVALID_CONNECT_DATA(rsp, cntlid);
@@ -1287,7 +1287,7 @@ spdk_nvmf_ctrlr_get_features_reservation_notification_mask(struct spdk_nvmf_requ 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	if (ns == NULL) {

		SPDK_ERRLOG("Set Features - Invalid Namespace ID\n");

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;
@@ -1317,7 +1317,7 @@ spdk_nvmf_ctrlr_set_features_reservation_notification_mask(struct spdk_nvmf_requ 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	if (ns == NULL) {

		SPDK_ERRLOG("Set Features - Invalid Namespace ID\n");

		rsp->status.sc = SPDK_NVME_SC_INVALID_FIELD;
@@ -1338,7 +1338,7 @@ spdk_nvmf_ctrlr_get_features_reservation_persistence(struct spdk_nvmf_request *r 


	SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Get Features - Reservation Persistence\n");



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	/* NSID with 0xffffffffu also included */

	if (ns == NULL) {

		SPDK_ERRLOG("Get Features - Invalid Namespace ID\n");
@@ -1365,7 +1365,7 @@ spdk_nvmf_ctrlr_set_features_reservation_persistence(struct spdk_nvmf_request *r 


	SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Set Features - Reservation Persistence\n");



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ptpl = cmd->cdw11_bits.feat_rsv_persistence.bits.ptpl;



	if (cmd->nsid != 0xffffffffu && ns && ns->ptpl_file) {
@@ -1529,7 +1529,7 @@ spdk_nvmf_get_firmware_slot_log_page(void *buffer, uint64_t offset, uint32_t len 
}



void

spdk_nvmf_ctrlr_ns_changed(struct spdk_nvmf_ctrlr *ctrlr, uint32_t nsid)

nvmf_ctrlr_ns_changed(struct spdk_nvmf_ctrlr *ctrlr, uint32_t nsid)

{

	uint16_t max_changes = SPDK_COUNTOF(ctrlr->changed_ns_list.ns_list);

	uint16_t i;
@@ -1714,7 +1714,7 @@ spdk_nvmf_ctrlr_get_log_page(struct spdk_nvmf_request *req) 
	if (subsystem->subtype == SPDK_NVMF_SUBTYPE_DISCOVERY) {

		switch (lid) {

		case SPDK_NVME_LOG_DISCOVERY:

			spdk_nvmf_get_discovery_log_page(subsystem->tgt, ctrlr->hostnqn, req->iov, req->iovcnt, offset,

			nvmf_get_discovery_log_page(subsystem->tgt, ctrlr->hostnqn, req->iov, req->iovcnt, offset,

						    len);

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		default:
@@ -1767,11 +1767,11 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	ns = _spdk_nvmf_subsystem_get_ns(subsystem, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(subsystem, cmd->nsid);

	if (ns == NULL || ns->bdev == NULL) {

		/*

		 * Inactive namespaces should return a zero filled data structure.

		 * The data buffer is already zeroed by spdk_nvmf_ctrlr_process_admin_cmd(),

		 * The data buffer is already zeroed by nvmf_ctrlr_process_admin_cmd(),

		 * so we can just return early here.

		 */

		SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Identify Namespace for inactive NSID %u\n", cmd->nsid);
@@ -1780,7 +1780,7 @@ spdk_nvmf_ctrlr_identify_ns(struct spdk_nvmf_ctrlr *ctrlr, 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	spdk_nvmf_bdev_ctrlr_identify_ns(ns, nsdata, ctrlr->dif_insert_or_strip);

	nvmf_bdev_ctrlr_identify_ns(ns, nsdata, ctrlr->dif_insert_or_strip);



	/* Due to bug in the Linux kernel NVMe driver we have to set noiob no larger than mdts */

	max_num_blocks = ctrlr->admin_qpair->transport->opts.max_io_size /
@@ -1885,8 +1885,8 @@ spdk_nvmf_ctrlr_identify_ctrlr(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_c 


		cdata->nvmf_specific = transport->cdata.nvmf_specific;



		cdata->oncs.dsm = spdk_nvmf_ctrlr_dsm_supported(ctrlr);

		cdata->oncs.write_zeroes = spdk_nvmf_ctrlr_write_zeroes_supported(ctrlr);

		cdata->oncs.dsm = nvmf_ctrlr_dsm_supported(ctrlr);

		cdata->oncs.write_zeroes = nvmf_ctrlr_write_zeroes_supported(ctrlr);

		cdata->oncs.reservations = 1;



		nvmf_ctrlr_populate_oacs(ctrlr, cdata);
@@ -1975,7 +1975,7 @@ spdk_nvmf_ctrlr_identify_ns_id_descriptor_list( 
	size_t buf_remain = id_desc_list_size;

	void *buf_ptr = id_desc_list;



	ns = _spdk_nvmf_subsystem_get_ns(subsystem, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(subsystem, cmd->nsid);

	if (ns == NULL || ns->bdev == NULL) {

		rsp->status.sct = SPDK_NVME_SCT_GENERIC;

		rsp->status.sc = SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT;
@@ -1995,7 +1995,7 @@ spdk_nvmf_ctrlr_identify_ns_id_descriptor_list( 


	/*

	 * The list is automatically 0-terminated because controller to host buffers in

	 * admin commands always get zeroed in spdk_nvmf_ctrlr_process_admin_cmd().

	 * admin commands always get zeroed in nvmf_ctrlr_process_admin_cmd().

	 */



#undef ADD_ID_DESC
@@ -2054,7 +2054,7 @@ spdk_nvmf_qpair_abort(struct spdk_nvmf_qpair *qpair, uint16_t cid) 
	struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;

	struct spdk_nvmf_request *req;



	if (spdk_nvmf_qpair_is_admin_queue(qpair)) {

	if (nvmf_qpair_is_admin_queue(qpair)) {

		if (ctrlr->aer_req && ctrlr->aer_req->cmd->nvme_cmd.cid == cid) {

			SPDK_DEBUGLOG(SPDK_LOG_NVMF, "Aborting AER request\n");

			req = ctrlr->aer_req;
@@ -2261,7 +2261,7 @@ spdk_nvmf_ctrlr_keep_alive(struct spdk_nvmf_request *req) 
}



int

spdk_nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

nvmf_ctrlr_process_admin_cmd(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_ctrlr *ctrlr = req->qpair->ctrlr;

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -2341,7 +2341,7 @@ invalid_opcode: 
}



int

spdk_nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req)

nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req)

{

	struct spdk_nvmf_qpair *qpair = req->qpair;

	struct spdk_nvmf_capsule_cmd *cap_hdr;
@@ -2359,7 +2359,7 @@ spdk_nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req) 
			req->rsp->nvme_cpl.status.sc = SPDK_NVME_SC_COMMAND_SEQUENCE_ERROR;

			return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

		}

	} else if (spdk_nvmf_qpair_is_admin_queue(qpair)) {

	} else if (nvmf_qpair_is_admin_queue(qpair)) {

		/*

		 * Controller session is established, and this is an admin queue.

		 * Disallow Connect and allow other fabrics commands.
@@ -2387,7 +2387,7 @@ spdk_nvmf_ctrlr_process_fabrics_cmd(struct spdk_nvmf_request *req) 
}



int

spdk_nvmf_ctrlr_async_event_ns_notice(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_async_event_ns_notice(struct spdk_nvmf_ctrlr *ctrlr)

{

	struct spdk_nvmf_request *req;

	struct spdk_nvme_cpl *rsp;
@@ -2428,7 +2428,7 @@ spdk_nvmf_ctrlr_async_event_ns_notice(struct spdk_nvmf_ctrlr *ctrlr) 
}



void

spdk_nvmf_ctrlr_async_event_reservation_notification(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_async_event_reservation_notification(struct spdk_nvmf_ctrlr *ctrlr)

{

	struct spdk_nvmf_request *req;

	struct spdk_nvme_cpl *rsp;
@@ -2465,11 +2465,11 @@ spdk_nvmf_ctrlr_async_event_reservation_notification(struct spdk_nvmf_ctrlr *ctr 
}



void

spdk_nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair)

nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair)

{

	struct spdk_nvmf_ctrlr *ctrlr = qpair->ctrlr;



	if (!spdk_nvmf_qpair_is_admin_queue(qpair)) {

	if (!nvmf_qpair_is_admin_queue(qpair)) {

		return;

	}
@@ -2480,7 +2480,7 @@ spdk_nvmf_qpair_free_aer(struct spdk_nvmf_qpair *qpair) 
}



void

spdk_nvmf_ctrlr_abort_aer(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_abort_aer(struct spdk_nvmf_ctrlr *ctrlr)

{

	if (!ctrlr->aer_req) {

		return;
@@ -2511,11 +2511,11 @@ _nvmf_ctrlr_add_reservation_log(void *ctx) 
	log->log.num_avail_log_pages = ctrlr->num_avail_log_pages++;

	TAILQ_INSERT_TAIL(&ctrlr->log_head, log, link);



	spdk_nvmf_ctrlr_async_event_reservation_notification(ctrlr);

	nvmf_ctrlr_async_event_reservation_notification(ctrlr);

}



void

spdk_nvmf_ctrlr_reservation_notice_log(struct spdk_nvmf_ctrlr *ctrlr,

nvmf_ctrlr_reservation_notice_log(struct spdk_nvmf_ctrlr *ctrlr,

				  struct spdk_nvmf_ns *ns,

				  enum spdk_nvme_reservation_notification_log_page_type type)

{
@@ -2717,7 +2717,7 @@ spdk_nvmf_ctrlr_process_io_fused_cmd(struct spdk_nvmf_request *req, struct spdk_ 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	rc = spdk_nvmf_bdev_ctrlr_compare_and_write_cmd(bdev, desc, ch, req->first_fused_req, req);

	rc = nvmf_bdev_ctrlr_compare_and_write_cmd(bdev, desc, ch, req->first_fused_req, req);



	if (rc == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE) {

		if (spdk_nvme_cpl_is_error(rsp)) {
@@ -2736,7 +2736,7 @@ spdk_nvmf_ctrlr_process_io_fused_cmd(struct spdk_nvmf_request *req, struct spdk_ 
}



int

spdk_nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)

nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req)

{

	uint32_t nsid;

	struct spdk_nvmf_ns *ns;
@@ -2767,7 +2767,7 @@ spdk_nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 
		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;

	}



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, nsid);

	if (ns == NULL || ns->bdev == NULL) {

		SPDK_ERRLOG("Unsuccessful query for nsid %u\n", cmd->nsid);

		response->status.sc = SPDK_NVME_SC_INVALID_NAMESPACE_OR_FORMAT;
@@ -2804,25 +2804,25 @@ spdk_nvmf_ctrlr_process_io_cmd(struct spdk_nvmf_request *req) 


	switch (cmd->opc) {

	case SPDK_NVME_OPC_READ:

		return spdk_nvmf_bdev_ctrlr_read_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_read_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_WRITE:

		return spdk_nvmf_bdev_ctrlr_write_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_write_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_COMPARE:

		return spdk_nvmf_bdev_ctrlr_compare_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_compare_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_WRITE_ZEROES:

		return spdk_nvmf_bdev_ctrlr_write_zeroes_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_write_zeroes_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_FLUSH:

		return spdk_nvmf_bdev_ctrlr_flush_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_flush_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_DATASET_MANAGEMENT:

		return spdk_nvmf_bdev_ctrlr_dsm_cmd(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_dsm_cmd(bdev, desc, ch, req);

	case SPDK_NVME_OPC_RESERVATION_REGISTER:

	case SPDK_NVME_OPC_RESERVATION_ACQUIRE:

	case SPDK_NVME_OPC_RESERVATION_RELEASE:

	case SPDK_NVME_OPC_RESERVATION_REPORT:

		spdk_thread_send_msg(ctrlr->subsys->thread, spdk_nvmf_ns_reservation_request, req);

		spdk_thread_send_msg(ctrlr->subsys->thread, nvmf_ns_reservation_request, req);

		return SPDK_NVMF_REQUEST_EXEC_STATUS_ASYNCHRONOUS;

	default:

		return spdk_nvmf_bdev_ctrlr_nvme_passthru_io(bdev, desc, ch, req);

		return nvmf_bdev_ctrlr_nvme_passthru_io(bdev, desc, ch, req);

	}

}
@@ -2949,7 +2949,7 @@ _nvmf_request_exec(struct spdk_nvmf_request *req, 
	struct spdk_nvmf_qpair *qpair = req->qpair;

	enum spdk_nvmf_request_exec_status status;



	nvmf_trace_command(req->cmd, spdk_nvmf_qpair_is_admin_queue(qpair));

	nvmf_trace_command(req->cmd, nvmf_qpair_is_admin_queue(qpair));



	if (sgroup) {

		sgroup->io_outstanding++;
@@ -2959,11 +2959,11 @@ _nvmf_request_exec(struct spdk_nvmf_request *req, 
	TAILQ_INSERT_TAIL(&qpair->outstanding, req, link);



	if (spdk_unlikely(req->cmd->nvmf_cmd.opcode == SPDK_NVME_OPC_FABRIC)) {

		status = spdk_nvmf_ctrlr_process_fabrics_cmd(req);

	} else if (spdk_unlikely(spdk_nvmf_qpair_is_admin_queue(qpair))) {

		status = spdk_nvmf_ctrlr_process_admin_cmd(req);

		status = nvmf_ctrlr_process_fabrics_cmd(req);

	} else if (spdk_unlikely(nvmf_qpair_is_admin_queue(qpair))) {

		status = nvmf_ctrlr_process_admin_cmd(req);

	} else {

		status = spdk_nvmf_ctrlr_process_io_cmd(req);

		status = nvmf_ctrlr_process_io_cmd(req);

	}



	if (status == SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE) {
@@ -3036,7 +3036,7 @@ spdk_nvmf_ctrlr_get_dif_ctx(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_cmd 
		return false;

	}



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, cmd->nsid);

	if (ns == NULL || ns->bdev == NULL) {

		return false;

	}
@@ -3047,7 +3047,7 @@ spdk_nvmf_ctrlr_get_dif_ctx(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_cmd 
	case SPDK_NVME_OPC_READ:

	case SPDK_NVME_OPC_WRITE:

	case SPDK_NVME_OPC_COMPARE:

		return spdk_nvmf_bdev_ctrlr_get_dif_ctx(bdev, cmd, dif_ctx);

		return nvmf_bdev_ctrlr_get_dif_ctx(bdev, cmd, dif_ctx);

	default:

		break;

	}
@@ -3073,7 +3073,7 @@ spdk_nvmf_request_get_dif_ctx(struct spdk_nvmf_request *req, struct spdk_dif_ctx 
		return false;

	}



	if (spdk_unlikely(spdk_nvmf_qpair_is_admin_queue(qpair))) {

	if (spdk_unlikely(nvmf_qpair_is_admin_queue(qpair))) {

		return false;

	}
@@ -3132,7 +3132,7 @@ spdk_nvmf_request_get_bdev(uint32_t nsid, struct spdk_nvmf_request *req, 
	*desc = NULL;

	*ch = NULL;



	ns = _spdk_nvmf_subsystem_get_ns(ctrlr->subsys, nsid);

	ns = _nvmf_subsystem_get_ns(ctrlr->subsys, nsid);

	if (ns == NULL || ns->bdev == NULL) {

		return -EINVAL;

	}

lib/nvmf/ctrlr_bdev.c

+24 −24
Original line number Diff line number Diff line
@@ -76,13 +76,13 @@ spdk_nvmf_subsystem_bdev_io_type_supported(struct spdk_nvmf_subsystem *subsystem 
}



bool

spdk_nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_dsm_supported(struct spdk_nvmf_ctrlr *ctrlr)

{

	return spdk_nvmf_subsystem_bdev_io_type_supported(ctrlr->subsys, SPDK_BDEV_IO_TYPE_UNMAP);

}



bool

spdk_nvmf_ctrlr_write_zeroes_supported(struct spdk_nvmf_ctrlr *ctrlr)

nvmf_ctrlr_write_zeroes_supported(struct spdk_nvmf_ctrlr *ctrlr)

{

	return spdk_nvmf_subsystem_bdev_io_type_supported(ctrlr->subsys, SPDK_BDEV_IO_TYPE_WRITE_ZEROES);

}
@@ -135,7 +135,7 @@ nvmf_bdev_ctrlr_complete_admin_cmd(struct spdk_bdev_io *bdev_io, bool success, 
}



void

spdk_nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata,

nvmf_bdev_ctrlr_identify_ns(struct spdk_nvmf_ns *ns, struct spdk_nvme_ns_data *nsdata,

			    bool dif_insert_or_strip)

{

	struct spdk_bdev *bdev = ns->bdev;
@@ -229,7 +229,7 @@ spdk_nvmf_ctrlr_process_io_cmd_resubmit(void *arg) 
{

	struct spdk_nvmf_request *req = arg;



	spdk_nvmf_ctrlr_process_io_cmd(req);

	nvmf_ctrlr_process_io_cmd(req);

}



static void
@@ -237,7 +237,7 @@ spdk_nvmf_ctrlr_process_admin_cmd_resubmit(void *arg) 
{

	struct spdk_nvmf_request *req = arg;



	spdk_nvmf_ctrlr_process_admin_cmd(req);

	nvmf_ctrlr_process_admin_cmd(req);

}



static void
@@ -258,7 +258,7 @@ nvmf_bdev_ctrl_queue_io(struct spdk_nvmf_request *req, struct spdk_bdev *bdev, 
}



int

spdk_nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			 struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);
@@ -302,7 +302,7 @@ spdk_nvmf_bdev_ctrlr_read_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *des 
}



int

spdk_nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			  struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);
@@ -346,7 +346,7 @@ spdk_nvmf_bdev_ctrlr_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *de 
}



int

spdk_nvmf_bdev_ctrlr_compare_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_compare_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			    struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);
@@ -390,7 +390,7 @@ spdk_nvmf_bdev_ctrlr_compare_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc * 
}



int

spdk_nvmf_bdev_ctrlr_compare_and_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_compare_and_write_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

				      struct spdk_io_channel *ch, struct spdk_nvmf_request *cmp_req, struct spdk_nvmf_request *write_req)

{

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);
@@ -445,7 +445,7 @@ spdk_nvmf_bdev_ctrlr_compare_and_write_cmd(struct spdk_bdev *bdev, struct spdk_b 
}



int

spdk_nvmf_bdev_ctrlr_write_zeroes_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_write_zeroes_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

				 struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	uint64_t bdev_num_blocks = spdk_bdev_get_num_blocks(bdev);
@@ -480,7 +480,7 @@ spdk_nvmf_bdev_ctrlr_write_zeroes_cmd(struct spdk_bdev *bdev, struct spdk_bdev_d 
}



int

spdk_nvmf_bdev_ctrlr_flush_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_flush_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			  struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
@@ -633,7 +633,7 @@ nvmf_bdev_ctrlr_unmap(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc, 
}



int

spdk_nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

			struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	struct spdk_nvme_cmd *cmd = &req->cmd->nvme_cmd;
@@ -649,7 +649,7 @@ spdk_nvmf_bdev_ctrlr_dsm_cmd(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc 
}



int

spdk_nvmf_bdev_ctrlr_nvme_passthru_io(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

nvmf_bdev_ctrlr_nvme_passthru_io(struct spdk_bdev *bdev, struct spdk_bdev_desc *desc,

				 struct spdk_io_channel *ch, struct spdk_nvmf_request *req)

{

	int rc;
@@ -694,7 +694,7 @@ spdk_nvmf_bdev_ctrlr_nvme_passthru_admin(struct spdk_bdev *bdev, struct spdk_bde 
}



bool

spdk_nvmf_bdev_ctrlr_get_dif_ctx(struct spdk_bdev *bdev, struct spdk_nvme_cmd *cmd,

nvmf_bdev_ctrlr_get_dif_ctx(struct spdk_bdev *bdev, struct spdk_nvme_cmd *cmd,

			    struct spdk_dif_ctx *dif_ctx)

{

	uint32_t init_ref_tag, dif_check_flags = 0;

lib/nvmf/ctrlr_discovery.c

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ nvmf_generate_discovery_log(struct spdk_nvmf_tgt *tgt, const char *hostnqn, size 
}



void

spdk_nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn, struct iovec *iov,

nvmf_get_discovery_log_page(struct spdk_nvmf_tgt *tgt, const char *hostnqn, struct iovec *iov,

			    uint32_t iovcnt, uint64_t offset, uint32_t length)

{

	size_t copy_len = 0;

lib/nvmf/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -1167,7 +1167,7 @@ nvmf_fc_req_bdev_abort(void *arg1) 
	 */

	if (ctrlr->aer_req == &fc_req->req) {

		SPDK_NOTICELOG("Abort AER request\n");

		spdk_nvmf_qpair_free_aer(fc_req->req.qpair);

		nvmf_qpair_free_aer(fc_req->req.qpair);

	}

}

lib/nvmf/fc_ls.c

+1 −1
Original line number Diff line number Diff line
@@ -1491,7 +1491,7 @@ nvmf_fc_poller_api_del_connection(void *arg) 


	TAILQ_FOREACH_SAFE(fc_req, &hwqp->in_use_reqs, link, tmp) {

		if (fc_req->fc_conn->conn_id == fc_conn->conn_id) {

			if (spdk_nvmf_qpair_is_admin_queue(&fc_conn->qpair) &&

			if (nvmf_qpair_is_admin_queue(&fc_conn->qpair) &&

			    (fc_req->req.cmd->nvme_cmd.opc == SPDK_NVME_OPC_ASYNC_EVENT_REQUEST)) {

				/* AER will be cleaned by spdk_nvmf_qpair_disconnect. */

				continue;