From bbbe586b28e2f8de35cfbeec4ae8376977f1cddd Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 16 Jan 2020 09:24:51 -0500 Subject: [PATCH] lib/blob: make passing ctx more explicit No functional change is done in this patch. Most of the functions already translate cb_arg to ctx and use it, but then just pass cb_arg. This will make it clear that it is ctx that is passed around. Along with simplifying some of changes in next patch, where arguments of functions will be cut down just to the ctx. Signed-off-by: Tomasz Zawadzki Change-Id: If7d8ed38dc92175d867a2231ab2ebd4f2499efcd Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/482006 Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins Community-CI: SPDK CI Jenkins --- lib/blob/blobstore.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/blob/blobstore.c b/lib/blob/blobstore.c index 38ce0fdde..d32d7c122 100644 --- a/lib/blob/blobstore.c +++ b/lib/blob/blobstore.c @@ -3136,7 +3136,7 @@ _spdk_bs_load_write_used_blobids_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int spdk_free(ctx->mask); ctx->mask = NULL; - _spdk_bs_write_used_clusters(seq, cb_arg, _spdk_bs_load_write_used_clusters_cpl); + _spdk_bs_write_used_clusters(seq, ctx, _spdk_bs_load_write_used_clusters_cpl); } static void @@ -3147,7 +3147,7 @@ _spdk_bs_load_write_used_pages_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bs spdk_free(ctx->mask); ctx->mask = NULL; - _spdk_bs_write_used_blobids(seq, cb_arg, _spdk_bs_load_write_used_blobids_cpl); + _spdk_bs_write_used_blobids(seq, ctx, _spdk_bs_load_write_used_blobids_cpl); } static void @@ -3183,7 +3183,7 @@ _spdk_bs_load_replay_md_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) if (ctx->page->next != SPDK_INVALID_MD_PAGE) { ctx->in_page_chain = true; ctx->cur_page = ctx->page->next; - _spdk_bs_load_replay_cur_md_page(seq, cb_arg); + _spdk_bs_load_replay_cur_md_page(seq, ctx); return; } } @@ -3197,7 +3197,7 @@ _spdk_bs_load_replay_md_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) if (ctx->page_index < ctx->super->md_len) { ctx->cur_page = ctx->page_index; - _spdk_bs_load_replay_cur_md_page(seq, cb_arg); + _spdk_bs_load_replay_cur_md_page(seq, ctx); } else { /* Claim all of the clusters used by the metadata */ num_md_clusters = spdk_divide_round_up(ctx->super->md_len, ctx->bs->pages_per_cluster); @@ -3235,7 +3235,7 @@ _spdk_bs_load_replay_md(spdk_bs_sequence_t *seq, void *cb_arg) _spdk_bs_load_ctx_fail(seq, ctx, -ENOMEM); return; } - _spdk_bs_load_replay_cur_md_page(seq, cb_arg); + _spdk_bs_load_replay_cur_md_page(seq, ctx); } static void @@ -3263,7 +3263,7 @@ _spdk_bs_recover(spdk_bs_sequence_t *seq, void *cb_arg) } ctx->bs->num_free_clusters = ctx->bs->total_clusters; - _spdk_bs_load_replay_md(seq, cb_arg); + _spdk_bs_load_replay_md(seq, ctx); } static void @@ -3562,7 +3562,7 @@ _spdk_bs_dump_read_md_page_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrn ctx->cur_page++; if (ctx->cur_page < ctx->super->md_len) { - _spdk_bs_dump_read_md_page(seq, cb_arg); + _spdk_bs_dump_read_md_page(seq, ctx); } else { spdk_free(ctx->page); _spdk_bs_dump_finish(seq, ctx, 0); @@ -3624,7 +3624,7 @@ _spdk_bs_dump_super_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) _spdk_bs_dump_finish(seq, ctx, -ENOMEM); return; } - _spdk_bs_dump_read_md_page(seq, cb_arg); + _spdk_bs_dump_read_md_page(seq, ctx); } void @@ -4027,7 +4027,7 @@ _spdk_bs_unload_write_used_blobids_cpl(spdk_bs_sequence_t *seq, void *cb_arg, in spdk_free(ctx->mask); ctx->mask = NULL; - _spdk_bs_write_used_clusters(seq, cb_arg, _spdk_bs_unload_write_used_clusters_cpl); + _spdk_bs_write_used_clusters(seq, ctx, _spdk_bs_unload_write_used_clusters_cpl); } static void @@ -4038,7 +4038,7 @@ _spdk_bs_unload_write_used_pages_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int spdk_free(ctx->mask); ctx->mask = NULL; - _spdk_bs_write_used_blobids(seq, cb_arg, _spdk_bs_unload_write_used_blobids_cpl); + _spdk_bs_write_used_blobids(seq, ctx, _spdk_bs_unload_write_used_blobids_cpl); } static void @@ -4568,7 +4568,7 @@ _spdk_bs_snapshot_origblob_sync_cpl(void *cb_arg, int bserrno) spdk_blob_set_read_only(newblob); /* sync snapshot metadata */ - spdk_blob_sync_md(newblob, _spdk_bs_clone_snapshot_origblob_cleanup, cb_arg); + spdk_blob_sync_md(newblob, _spdk_bs_clone_snapshot_origblob_cleanup, ctx); } static void