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

lib/blob: always pass cb_arg on blob load failure

Browse Source 
Originally the code was suposed to determine if
loading the blob succeeded, based on passing the
cb_arg.
This breaks the logic of always getting the cb_arg in
cb_fn, and basing the success on bserrno.

In order to fix this, cb_fn always gets the passed
cb_arg. Meanwhile the cb_fn (_spdk_bs_open_blob_cpl(),
now checks the bserrno to determine failure.

In addition since _spdk_bs_open_blob() was the original
caller allocating the blob structure,
the  _spdk_bs_open_blob_cpl() is now responsible for freeing it.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ic7eb09f05e04b08dc54fc43243fd576f493cbeb2
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/479141
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Tomasz Zawadzki 2020-01-02 08:43:19 -05:00
parent 3225f86bc2
commit e7b3be98a6
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/blob/blobstore.c
View File

@ -952,8 +952,7 @@ _spdk_blob_load_snapshot_cpl(void *cb_arg, struct spdk_blob *snapshot, int bserr
error: error:
SPDK_ERRLOG("Snapshot fail\n"); SPDK_ERRLOG("Snapshot fail\n");
_spdk_blob_free(blob); ctx->cb_fn(ctx->seq, ctx->cb_arg, bserrno);
ctx->cb_fn(ctx->seq, NULL, bserrno);
spdk_free(ctx->pages); spdk_free(ctx->pages);
free(ctx); free(ctx);
} }
@ -971,8 +970,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
if (bserrno) { if (bserrno) {
SPDK_ERRLOG("Metadata page read failed: %d\n", bserrno); SPDK_ERRLOG("Metadata page read failed: %d\n", bserrno);
_spdk_blob_free(blob); ctx->cb_fn(seq, ctx->cb_arg, bserrno);
ctx->cb_fn(seq, NULL, bserrno);
spdk_free(ctx->pages); spdk_free(ctx->pages);
free(ctx); free(ctx);
return; return;
@ -982,8 +980,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
crc = _spdk_blob_md_page_calc_crc(page); crc = _spdk_blob_md_page_calc_crc(page);
if (crc != page->crc) { if (crc != page->crc) {
SPDK_ERRLOG("Metadata page %d crc mismatch\n", ctx->num_pages); SPDK_ERRLOG("Metadata page %d crc mismatch\n", ctx->num_pages);
_spdk_blob_free(blob); ctx->cb_fn(seq, ctx->cb_arg, -EINVAL);
ctx->cb_fn(seq, NULL, -EINVAL);
spdk_free(ctx->pages); spdk_free(ctx->pages);
free(ctx); free(ctx);
return; return;
@ -1004,6 +1001,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
sizeof(*page)); sizeof(*page));
if (ctx->pages == NULL) { if (ctx->pages == NULL) {
ctx->cb_fn(seq, ctx->cb_arg, -ENOMEM); ctx->cb_fn(seq, ctx->cb_arg, -ENOMEM);
spdk_free(ctx->pages);
free(ctx); free(ctx);
return; return;
} }
@ -1018,8 +1016,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
/* Parse the pages */ /* Parse the pages */
rc = _spdk_blob_parse(ctx->pages, ctx->num_pages, blob); rc = _spdk_blob_parse(ctx->pages, ctx->num_pages, blob);
if (rc) { if (rc) {
_spdk_blob_free(blob); ctx->cb_fn(seq, ctx->cb_arg, rc);
ctx->cb_fn(seq, NULL, rc);
spdk_free(ctx->pages); spdk_free(ctx->pages);
free(ctx); free(ctx);
return; return;
@ -1029,8 +1026,7 @@ _spdk_blob_load_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
rc = _spdk_blob_get_xattr_value(blob, BLOB_SNAPSHOT, &value, &len, true); rc = _spdk_blob_get_xattr_value(blob, BLOB_SNAPSHOT, &value, &len, true);
if (rc == 0) { if (rc == 0) {
if (len != sizeof(spdk_blob_id)) { if (len != sizeof(spdk_blob_id)) {
_spdk_blob_free(blob); ctx->cb_fn(seq, ctx->cb_arg, -EINVAL);
ctx->cb_fn(seq, NULL, -EINVAL);
spdk_free(ctx->pages); spdk_free(ctx->pages);
free(ctx); free(ctx);
return; return;
@ -5680,8 +5676,8 @@ _spdk_bs_open_blob_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)
{ {
struct spdk_blob *blob = cb_arg; struct spdk_blob *blob = cb_arg;
/* If the blob have crc error, we just return NULL. */ if (bserrno != 0) {
if (blob == NULL) { _spdk_blob_free(blob);
seq->cpl.u.blob_handle.blob = NULL; seq->cpl.u.blob_handle.blob = NULL;
spdk_bs_sequence_finish(seq, bserrno); spdk_bs_sequence_finish(seq, bserrno);
return; return;