Commit 0f59982b authored by Jinlong Chen's avatar Jinlong Chen Committed by Jim Harris
Browse files

blob: don't use bs_load_ctx_fail in bs_write_used_* functions 



bs_write_used_* functions are used both in blobstore loading and
unloading processes. However, the two processes actually need different
error handling logics.

Let the functions call their callbacks direclty instead of calling
bs_load_ctx_fail for error cases, so that we can use different error
handling logics for loading and unloading.

Change-Id: I4865eb91f1d8aa36e3ca64779c08a252433a7b34
Signed-off-by: default avatarJinlong Chen <chenjinlong.cjl@alibaba-inc.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/25471


Reviewed-by: default avatarJim Harris <jim.harris@nvidia.com>
Community-CI: Community CI Samsung <spdk.community.ci.samsung@gmail.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
parent 0354bb8e

lib/blob/blobstore.c

+17 −16
Original line number Diff line number Diff line
@@ -4001,19 +4001,6 @@ bs_alloc(struct spdk_bs_dev *dev, struct spdk_bs_opts *opts, struct spdk_blob_st 
	return 0;

}



static void

bs_load_ctx_fail(struct spdk_bs_load_ctx *ctx, int bserrno)

{

	assert(bserrno != 0);



	spdk_free(ctx->mask);

	spdk_free(ctx->super);

	bs_sequence_finish(ctx->seq, bserrno);

	bs_free(ctx->bs);

	spdk_bit_array_free(&ctx->used_clusters);

	free(ctx);

}



static void

bs_write_super(spdk_bs_sequence_t *seq, struct spdk_blob_store *bs,

	       struct spdk_bs_super_block *super, spdk_bs_sequence_cpl cb_fn, void *cb_arg)
@@ -4038,7 +4025,7 @@ bs_write_used_clusters(spdk_bs_sequence_t *seq, void *arg, spdk_bs_sequence_cpl 
	ctx->mask = spdk_zmalloc(mask_size, 0x1000, NULL,

				 SPDK_ENV_NUMA_ID_ANY, SPDK_MALLOC_DMA);

	if (!ctx->mask) {

		bs_load_ctx_fail(ctx, -ENOMEM);

		cb_fn(seq, arg, -ENOMEM);

		return;

	}
@@ -4071,7 +4058,7 @@ bs_write_used_md(spdk_bs_sequence_t *seq, void *arg, spdk_bs_sequence_cpl cb_fn) 
	ctx->mask = spdk_zmalloc(mask_size, 0x1000, NULL,

				 SPDK_ENV_NUMA_ID_ANY, SPDK_MALLOC_DMA);

	if (!ctx->mask) {

		bs_load_ctx_fail(ctx, -ENOMEM);

		cb_fn(seq, arg, -ENOMEM);

		return;

	}
@@ -4104,7 +4091,7 @@ bs_write_used_blobids(spdk_bs_sequence_t *seq, void *arg, spdk_bs_sequence_cpl c 
	ctx->mask = spdk_zmalloc(mask_size, 0x1000, NULL, SPDK_ENV_NUMA_ID_ANY,

				 SPDK_MALLOC_DMA);

	if (!ctx->mask) {

		bs_load_ctx_fail(ctx, -ENOMEM);

		cb_fn(seq, arg, -ENOMEM);

		return;

	}
@@ -4319,6 +4306,19 @@ bs_load_complete(struct spdk_bs_load_ctx *ctx) 
	spdk_bs_iter_first(ctx->bs, bs_load_iter, ctx);

}



static void

bs_load_ctx_fail(struct spdk_bs_load_ctx *ctx, int bserrno)

{

	assert(bserrno != 0);



	spdk_free(ctx->mask);

	spdk_free(ctx->super);

	bs_sequence_finish(ctx->seq, bserrno);

	bs_free(ctx->bs);

	spdk_bit_array_free(&ctx->used_clusters);

	free(ctx);

}



static void

bs_load_used_blobids_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno)

{
@@ -5819,6 +5819,7 @@ bs_unload_write_used_clusters_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bse 
	struct spdk_bs_load_ctx	*ctx = cb_arg;



	spdk_free(ctx->mask);

	ctx->mask = NULL;



	if (bserrno != 0) {

		bs_unload_finish(ctx, bserrno);