From 1bc356bb21e6b8c3ae700c849057fbbf4d46a182 Mon Sep 17 00:00:00 2001 From: Kozlowski Mateusz Date: Mon, 12 Sep 2022 09:25:33 +0200 Subject: [PATCH] ftl: Fix abort in compaction retry path Don't try to abort when return code is actually 0. Signed-off-by: Kozlowski Mateusz Change-Id: Id93a43173ae54324dc61ba419d929fdec4d90264 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14449 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- lib/ftl/ftl_nv_cache.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/ftl/ftl_nv_cache.c b/lib/ftl/ftl_nv_cache.c index a6bf9f574..89879ce33 100644 --- a/lib/ftl/ftl_nv_cache.c +++ b/lib/ftl/ftl_nv_cache.c @@ -579,6 +579,10 @@ compaction_retry_read(void *_compactor) ret = compaction_submit_read(compactor, rq->io.addr, rq->iter.count); + if (spdk_likely(!ret)) { + return; + } + if (ret == -ENOMEM) { bdev = spdk_bdev_desc_get_bdev(compactor->nv_cache->bdev_desc); compactor->bdev_io_wait.bdev = bdev;