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

lib/ftl: Remove num_pad_bands counter from restore

Browse Source 
Base off restore completion on list population rather than another
counter.

Signed-off-by: Mateusz Kozlowski <mateusz.kozlowski@intel.com>
Change-Id: I8f9d8f13aea42e1c350640efd84ff6c247eded0a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457606
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Mateusz Kozlowski 2019-06-11 14:14:34 +02:00 committed by Ben Walker
parent a57daa6976
commit d679b0ec6a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ftl/ftl_restore.c
View File

@ -64,8 +64,6 @@ struct ftl_restore {
STAILQ_HEAD(, ftl_restore_band) pad_bands;
size_t num_pad_bands;
int pad_status;
void *md_buf;
@ -377,6 +375,7 @@ static bool
ftl_pad_chunk_pad_finish(struct ftl_restore_band *rband, bool direct_access)
{
struct ftl_restore *restore = rband->parent;
struct ftl_restore_band *next_band;
size_t i, num_pad_chunks = 0;
if (spdk_unlikely(restore->pad_status && !restore->num_ios)) {
@ -403,12 +402,13 @@ ftl_pad_chunk_pad_finish(struct ftl_restore_band *rband, bool direct_access)
rband->band->state = FTL_BAND_STATE_CLOSED;
ftl_band_set_direct_access(rband->band, false);
}
if (--restore->num_pad_bands == 0) {
next_band = STAILQ_NEXT(rband, stailq);
if (!next_band) {
ftl_restore_complete(restore, restore->pad_status);
return true;
} else {
/* Start off padding in the next band */
ftl_restore_pad_band(STAILQ_NEXT(rband, stailq));
ftl_restore_pad_band(next_band);
return true;
}
}
@ -513,10 +513,7 @@ ftl_restore_pad_band(struct ftl_restore_band *rband)
band->state = FTL_BAND_STATE_OPEN;
rc = ftl_band_set_direct_access(band, true);
if (rc) {
restore->pad_status = rc;
if (--restore->num_pad_bands == 0) {
ftl_restore_complete(restore, restore->pad_status);
}
ftl_restore_complete(restore, rc);
return;
}
@ -587,7 +584,6 @@ ftl_restore_tail_md_cb(struct ftl_io *io, void *ctx, int status)
SPDK_ERRLOG("%s while restoring tail md. Will attempt to pad band %u.\n",
spdk_strerror(-status), rband->band->id);
STAILQ_INSERT_TAIL(&restore->pad_bands, rband, stailq);
restore->num_pad_bands++;
}
}