diff --git a/lib/nvmf/nvmf.c b/lib/nvmf/nvmf.c index 9bf23aaa7..3626bccff 100644 --- a/lib/nvmf/nvmf.c +++ b/lib/nvmf/nvmf.c @@ -1591,8 +1591,12 @@ nvmf_poll_group_resume_subsystem(struct spdk_nvmf_poll_group *group, /* Release all queued requests */ TAILQ_FOREACH_SAFE(req, &sgroup->queued, link, tmp) { TAILQ_REMOVE(&sgroup->queued, req, link); - assert(req->zcopy_phase == NVMF_ZCOPY_PHASE_NONE); - spdk_nvmf_request_exec(req); + if (spdk_nvmf_request_using_zcopy(req)) { + spdk_nvmf_request_zcopy_start(req); + } else { + spdk_nvmf_request_exec(req); + } + } fini: if (cb_fn) { diff --git a/test/unit/lib/nvmf/fc.c/fc_ut.c b/test/unit/lib/nvmf/fc.c/fc_ut.c index 0871c3909..5bea41f09 100644 --- a/test/unit/lib/nvmf/fc.c/fc_ut.c +++ b/test/unit/lib/nvmf/fc.c/fc_ut.c @@ -133,6 +133,7 @@ DEFINE_STUB_V(rte_hash_free, (struct rte_hash *h)); DEFINE_STUB(nvmf_fc_lld_port_add, int, (struct spdk_nvmf_fc_port *fc_port), 0); DEFINE_STUB(nvmf_fc_lld_port_remove, int, (struct spdk_nvmf_fc_port *fc_port), 0); +DEFINE_STUB_V(spdk_nvmf_request_zcopy_start, (struct spdk_nvmf_request *req)); DEFINE_STUB_V(spdk_nvmf_request_zcopy_end, (struct spdk_nvmf_request *req, bool commit)); const char * diff --git a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c index 9906a00b1..f360b67e2 100644 --- a/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c +++ b/test/unit/lib/nvmf/nvmf.c/nvmf_ut.c @@ -121,6 +121,7 @@ DEFINE_STUB(nvmf_transport_qpair_get_listen_trid, int, (struct spdk_nvmf_qpair *qpair, struct spdk_nvme_transport_id *trid), 0); DEFINE_STUB_V(spdk_nvmf_request_exec, (struct spdk_nvmf_request *req)); +DEFINE_STUB_V(spdk_nvmf_request_zcopy_start, (struct spdk_nvmf_request *req)); DEFINE_STUB(spdk_nvmf_get_transport_name, const char *, (struct spdk_nvmf_transport *transport), NULL); DEFINE_STUB(spdk_nvmf_transport_destroy, int, (struct spdk_nvmf_transport *transport,