From 168cfd12cabc9ebe15316d70a9c3160120ea5a26 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Thu, 15 Feb 2018 14:46:44 -0700 Subject: [PATCH] blob: add _spdk_bs_load_complete This reduces some code duplication and ensures all successful load operations (whether or not it included recovery after power fail) through the same function. Signed-off-by: Jim Harris Change-Id: Ia463ce6ebe976ab2420525d86962e8fe54ad04d7 Reviewed-on: https://review.gerrithub.io/400164 Reviewed-by: Daniel Verkamp Tested-by: SPDK Automated Test System Reviewed-by: Tomasz Zawadzki --- lib/blob/blobstore.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index d2b70891a..c426d0bdc 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -2184,6 +2184,15 @@ _spdk_bs_write_used_blobids(spdk_bs_sequence_t *seq, void *arg, spdk_bs_sequence spdk_bs_sequence_write_dev(seq, ctx->mask, lba, lba_count, cb_fn, arg); } +static void +_spdk_bs_load_complete(spdk_bs_sequence_t *seq, struct spdk_bs_load_ctx *ctx, int bserrno) +{ + spdk_dma_free(ctx->super); + spdk_dma_free(ctx->mask); + free(ctx); + spdk_bs_sequence_finish(seq, bserrno); +} + static void _spdk_bs_load_used_blobids_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) { @@ -2219,11 +2228,7 @@ _spdk_bs_load_used_blobids_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrn } } - spdk_dma_free(ctx->super); - spdk_dma_free(ctx->mask); - free(ctx); - - spdk_bs_sequence_finish(seq, bserrno); + _spdk_bs_load_complete(seq, ctx, bserrno); } static void @@ -2420,10 +2425,7 @@ _spdk_bs_load_write_used_clusters_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int { struct spdk_bs_load_ctx *ctx = cb_arg; - spdk_dma_free(ctx->mask); - spdk_dma_free(ctx->super); - spdk_bs_sequence_finish(seq, bserrno); - free(ctx); + _spdk_bs_load_complete(seq, ctx, bserrno); } static void