Commit 30a4eea3 authored by Jim Harris's avatar Jim Harris
Browse files

nvme: move nvme_free_request 



Prepares for an upcoming patch.

Signed-off-by: default avatarJim Harris <jim.harris@samsung.com>
Change-Id: I7696ff7cda4581bdb8ca61268b4d20bf30a599f8
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/20647


Community-CI: Mellanox Build Bot
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMichael Haeuptle <michaelhaeuptle@gmail.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDeepak Abraham Tom <deepak-abraham.tom@hpe.com>
parent 30560979

lib/nvme/nvme_internal.h

+18 −18
Original line number Diff line number Diff line
@@ -1332,6 +1332,24 @@ struct nvme_request *nvme_allocate_request_user_copy(struct spdk_nvme_qpair *qpa 
		void *buffer, uint32_t payload_size,

		spdk_nvme_cmd_cb cb_fn, void *cb_arg, bool host_to_controller);



static inline void

nvme_free_request(struct nvme_request *req)

{

	assert(req != NULL);

	assert(req->num_children == 0);

	assert(req->qpair != NULL);



	/* The reserved_req does not go in the free_req STAILQ - it is

	 * saved only for use with a FABRICS/CONNECT command.

	 */

	if (spdk_likely(req->qpair->reserved_req != req)) {

		STAILQ_INSERT_HEAD(&req->qpair->free_req, req, stailq);



		assert(req->qpair->num_outstanding_reqs > 0);

		req->qpair->num_outstanding_reqs--;

	}

}



static inline void

nvme_complete_request(spdk_nvme_cmd_cb cb_fn, void *cb_arg, struct spdk_nvme_qpair *qpair,

		      struct nvme_request *req, struct spdk_nvme_cpl *cpl)
@@ -1378,24 +1396,6 @@ nvme_complete_request(spdk_nvme_cmd_cb cb_fn, void *cb_arg, struct spdk_nvme_qpa 
	}

}



static inline void

nvme_free_request(struct nvme_request *req)

{

	assert(req != NULL);

	assert(req->num_children == 0);

	assert(req->qpair != NULL);



	/* The reserved_req does not go in the free_req STAILQ - it is

	 * saved only for use with a FABRICS/CONNECT command.

	 */

	if (spdk_likely(req->qpair->reserved_req != req)) {

		STAILQ_INSERT_HEAD(&req->qpair->free_req, req, stailq);



		assert(req->qpair->num_outstanding_reqs > 0);

		req->qpair->num_outstanding_reqs--;

	}

}



static inline void

nvme_qpair_set_state(struct spdk_nvme_qpair *qpair, enum nvme_qpair_state state)

{