ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/ftl: Minor cleanup in error path from nvme layer

Browse Source 
Change-Id: If64d721fac28683b9b385238ae1c63aad77c0914
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/451869
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Wojciech Malikowski 2019-04-24 07:48:14 -04:00 committed by Darek Stojaczyk
parent c8202a4d79
commit f7e68be171
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ftl/ftl_core.c
View File

@ -304,7 +304,7 @@ ftl_submit_erase(struct ftl_io *io)
ftl_trace_submission(dev, io, ppa, 1); ftl_trace_submission(dev, io, ppa, 1);
rc = spdk_nvme_ocssd_ns_cmd_vector_reset(dev->ns, ftl_get_write_qpair(dev), rc = spdk_nvme_ocssd_ns_cmd_vector_reset(dev->ns, ftl_get_write_qpair(dev),
&ppa_packed, 1, NULL, ftl_io_cmpl_cb, io); &ppa_packed, 1, NULL, ftl_io_cmpl_cb, io);
if (rc) { if (spdk_unlikely(rc)) {
ftl_io_fail(io, rc); ftl_io_fail(io, rc);
SPDK_ERRLOG("Vector reset failed with status: %d\n", rc); SPDK_ERRLOG("Vector reset failed with status: %d\n", rc);
break; break;
@ -831,11 +831,12 @@ ftl_submit_read(struct ftl_io *io)
ftl_io_iovec_addr(io), ftl_io_iovec_addr(io),
ftl_ppa_addr_pack(io->dev, ppa), lbk_cnt, ftl_ppa_addr_pack(io->dev, ppa), lbk_cnt,
ftl_io_cmpl_cb, io, 0); ftl_io_cmpl_cb, io, 0);
if (rc == -ENOMEM) { if (spdk_unlikely(rc)) {
ftl_add_to_retry_queue(io); if (rc == -ENOMEM) {
break; ftl_add_to_retry_queue(io);
} else if (rc) { } else {
ftl_io_fail(io, rc); ftl_io_fail(io, rc);
}
break; break;
} }
@ -1244,11 +1245,12 @@ ftl_submit_write(struct ftl_wptr *wptr, struct ftl_io *io)
} }
rc = ftl_submit_child_write(wptr, io, dev->xfer_size); rc = ftl_submit_child_write(wptr, io, dev->xfer_size);
if (rc == -EAGAIN) { if (spdk_unlikely(rc)) {
TAILQ_INSERT_TAIL(&wptr->pending_queue, io, retry_entry); if (rc == -EAGAIN) {
break; TAILQ_INSERT_TAIL(&wptr->pending_queue, io, retry_entry);
} else if (rc) { } else {
ftl_io_fail(io, rc); ftl_io_fail(io, rc);
}
break; break;
} }