Commit 3456377b authored by Seth Howell's avatar Seth Howell Committed by Tomasz Zawadzki
Browse files

lib: accel, bdev, blob, env_dpdk remove spdk_ prefix. 



Hitting only the static functions from the above libraries
with the spdk_ prefix.

Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Change-Id: Ic6df38dfbeb53f0b1c30d350921f7216acba3170
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2362


Community-CI: Mellanox Build Bot
Community-CI: Broadcom CI
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent d18e6320

lib/accel/accel_engine.c

+8 −8
Original line number Diff line number Diff line
@@ -79,14 +79,14 @@ spdk_accel_hw_engine_register(struct spdk_accel_engine *accel_engine) 


/* Registration of sw modules (currently supports only 1) */

static void

spdk_accel_sw_register(struct spdk_accel_engine *accel_engine)

accel_sw_register(struct spdk_accel_engine *accel_engine)

{

	assert(g_sw_accel_engine == NULL);

	g_sw_accel_engine = accel_engine;

}



static void

spdk_accel_sw_unregister(void)

accel_sw_unregister(void)

{

	g_sw_accel_engine = NULL;

}
@@ -214,7 +214,7 @@ spdk_accel_engine_get_io_channel(void) 
}



static void

spdk_accel_engine_module_initialize(void)

accel_engine_module_initialize(void)

{

	struct spdk_accel_module_if *accel_engine_module;
@@ -227,7 +227,7 @@ int 
spdk_accel_engine_initialize(void)

{

	SPDK_NOTICELOG("Accel engine initialized to use software engine.\n");

	spdk_accel_engine_module_initialize();

	accel_engine_module_initialize();

	/*

	 * We need a unique identifier for the accel engine framework, so use the

	 *  spdk_accel_module_list address for this purpose.
@@ -239,7 +239,7 @@ spdk_accel_engine_initialize(void) 
}



static void

spdk_accel_engine_module_finish_cb(void)

accel_engine_module_finish_cb(void)

{

	spdk_accel_fini_cb cb_fn = g_fini_cb_fn;
@@ -274,7 +274,7 @@ spdk_accel_engine_module_finish(void) 
	}



	if (!g_accel_engine_module) {

		spdk_accel_engine_module_finish_cb();

		accel_engine_module_finish_cb();

		return;

	}
@@ -415,7 +415,7 @@ sw_accel_engine_get_ctx_size(void) 
static int

sw_accel_engine_init(void)

{

	spdk_accel_sw_register(&sw_accel_engine);

	accel_sw_register(&sw_accel_engine);

	spdk_io_device_register(&sw_accel_engine, sw_accel_create_cb, sw_accel_destroy_cb, 0,

				"sw_accel_engine");
@@ -426,7 +426,7 @@ static void 
sw_accel_engine_fini(void *ctxt)

{

	spdk_io_device_unregister(&sw_accel_engine, NULL);

	spdk_accel_sw_unregister();

	accel_sw_unregister();



	spdk_accel_engine_module_finish();

}

lib/bdev/bdev_rpc.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static const struct spdk_json_object_decoder rpc_set_bdev_opts_decoders[] = { 
};



static void

spdk_rpc_bdev_set_options(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params)

rpc_bdev_set_options(struct spdk_jsonrpc_request *request, const struct spdk_json_val *params)

{

	struct spdk_rpc_set_bdev_opts rpc_opts;

	struct spdk_bdev_opts bdev_opts;
@@ -94,5 +94,5 @@ spdk_rpc_bdev_set_options(struct spdk_jsonrpc_request *request, const struct spd 
	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(request, w);

}

SPDK_RPC_REGISTER("bdev_set_options", spdk_rpc_bdev_set_options, SPDK_RPC_STARTUP)

SPDK_RPC_REGISTER("bdev_set_options", rpc_bdev_set_options, SPDK_RPC_STARTUP)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_set_options, set_bdev_options)

lib/bdev/part.c

+26 −26
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ spdk_bdev_part_base_free(struct spdk_bdev_part_base *base) 
}



static void

spdk_bdev_part_free_cb(void *io_device)

bdev_part_free_cb(void *io_device)

{

	struct spdk_bdev_part *part = io_device;

	struct spdk_bdev_part_base *base;
@@ -143,7 +143,7 @@ spdk_bdev_part_free_cb(void *io_device) 
int

spdk_bdev_part_free(struct spdk_bdev_part *part)

{

	spdk_io_device_unregister(part, spdk_bdev_part_free_cb);

	spdk_io_device_unregister(part, bdev_part_free_cb);



	/* Return 1 to indicate that this is an asynchronous operation that isn't complete

	 * until spdk_bdev_destruct_done is called */
@@ -163,7 +163,7 @@ spdk_bdev_part_base_hotremove(struct spdk_bdev_part_base *part_base, struct bdev 
}



static bool

spdk_bdev_part_io_type_supported(void *_part, enum spdk_bdev_io_type io_type)

bdev_part_io_type_supported(void *_part, enum spdk_bdev_io_type io_type)

{

	struct spdk_bdev_part *part = _part;
@@ -185,7 +185,7 @@ spdk_bdev_part_io_type_supported(void *_part, enum spdk_bdev_io_type io_type) 
}



static struct spdk_io_channel *

spdk_bdev_part_get_io_channel(void *_part)

bdev_part_get_io_channel(void *_part)

{

	struct spdk_bdev_part *part = _part;
@@ -217,7 +217,7 @@ spdk_bdev_part_get_offset_blocks(struct spdk_bdev_part *part) 
}



static int

spdk_bdev_part_remap_dif(struct spdk_bdev_io *bdev_io, uint32_t offset,

bdev_part_remap_dif(struct spdk_bdev_io *bdev_io, uint32_t offset,

		    uint32_t remapped_offset)

{

	struct spdk_bdev *bdev = bdev_io->bdev;
@@ -261,7 +261,7 @@ spdk_bdev_part_remap_dif(struct spdk_bdev_io *bdev_io, uint32_t offset, 
}



static void

spdk_bdev_part_complete_read_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

bdev_part_complete_read_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

{

	struct spdk_bdev_io *part_io = cb_arg;

	uint32_t offset, remapped_offset;
@@ -271,7 +271,7 @@ spdk_bdev_part_complete_read_io(struct spdk_bdev_io *bdev_io, bool success, void 
	remapped_offset = part_io->u.bdev.offset_blocks;



	if (success) {

		rc = spdk_bdev_part_remap_dif(bdev_io, offset, remapped_offset);

		rc = bdev_part_remap_dif(bdev_io, offset, remapped_offset);

		if (rc != 0) {

			success = false;

		}
@@ -284,7 +284,7 @@ spdk_bdev_part_complete_read_io(struct spdk_bdev_io *bdev_io, bool success, void 
}



static void

spdk_bdev_part_complete_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

bdev_part_complete_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

{

	struct spdk_bdev_io *part_io = cb_arg;

	int status = success ? SPDK_BDEV_IO_STATUS_SUCCESS : SPDK_BDEV_IO_STATUS_FAILED;
@@ -294,7 +294,7 @@ spdk_bdev_part_complete_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_ 
}



static void

spdk_bdev_part_complete_zcopy_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

bdev_part_complete_zcopy_io(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg)

{

	struct spdk_bdev_io *part_io = cb_arg;

	int status = success ? SPDK_BDEV_IO_STATUS_SUCCESS : SPDK_BDEV_IO_STATUS_FAILED;
@@ -323,18 +323,18 @@ spdk_bdev_part_submit_request(struct spdk_bdev_part_channel *ch, struct spdk_bde 
			rc = spdk_bdev_readv_blocks(base_desc, base_ch, bdev_io->u.bdev.iovs,

						    bdev_io->u.bdev.iovcnt, remapped_offset,

						    bdev_io->u.bdev.num_blocks,

						    spdk_bdev_part_complete_read_io, bdev_io);

						    bdev_part_complete_read_io, bdev_io);

		} else {

			rc = spdk_bdev_readv_blocks_with_md(base_desc, base_ch,

							    bdev_io->u.bdev.iovs,

							    bdev_io->u.bdev.iovcnt,

							    bdev_io->u.bdev.md_buf, remapped_offset,

							    bdev_io->u.bdev.num_blocks,

							    spdk_bdev_part_complete_read_io, bdev_io);

							    bdev_part_complete_read_io, bdev_io);

		}

		break;

	case SPDK_BDEV_IO_TYPE_WRITE:

		rc = spdk_bdev_part_remap_dif(bdev_io, offset, remapped_offset);

		rc = bdev_part_remap_dif(bdev_io, offset, remapped_offset);

		if (rc != 0) {

			return SPDK_BDEV_IO_STATUS_FAILED;

		}
@@ -343,39 +343,39 @@ spdk_bdev_part_submit_request(struct spdk_bdev_part_channel *ch, struct spdk_bde 
			rc = spdk_bdev_writev_blocks(base_desc, base_ch, bdev_io->u.bdev.iovs,

						     bdev_io->u.bdev.iovcnt, remapped_offset,

						     bdev_io->u.bdev.num_blocks,

						     spdk_bdev_part_complete_io, bdev_io);

						     bdev_part_complete_io, bdev_io);

		} else {

			rc = spdk_bdev_writev_blocks_with_md(base_desc, base_ch,

							     bdev_io->u.bdev.iovs,

							     bdev_io->u.bdev.iovcnt,

							     bdev_io->u.bdev.md_buf, remapped_offset,

							     bdev_io->u.bdev.num_blocks,

							     spdk_bdev_part_complete_io, bdev_io);

							     bdev_part_complete_io, bdev_io);

		}

		break;

	case SPDK_BDEV_IO_TYPE_WRITE_ZEROES:

		rc = spdk_bdev_write_zeroes_blocks(base_desc, base_ch, remapped_offset,

						   bdev_io->u.bdev.num_blocks, spdk_bdev_part_complete_io,

						   bdev_io->u.bdev.num_blocks, bdev_part_complete_io,

						   bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_UNMAP:

		rc = spdk_bdev_unmap_blocks(base_desc, base_ch, remapped_offset,

					    bdev_io->u.bdev.num_blocks, spdk_bdev_part_complete_io,

					    bdev_io->u.bdev.num_blocks, bdev_part_complete_io,

					    bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_FLUSH:

		rc = spdk_bdev_flush_blocks(base_desc, base_ch, remapped_offset,

					    bdev_io->u.bdev.num_blocks, spdk_bdev_part_complete_io,

					    bdev_io->u.bdev.num_blocks, bdev_part_complete_io,

					    bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_RESET:

		rc = spdk_bdev_reset(base_desc, base_ch,

				     spdk_bdev_part_complete_io, bdev_io);

				     bdev_part_complete_io, bdev_io);

		break;

	case SPDK_BDEV_IO_TYPE_ZCOPY:

		rc = spdk_bdev_zcopy_start(base_desc, base_ch, remapped_offset,

					   bdev_io->u.bdev.num_blocks, bdev_io->u.bdev.zcopy.populate,

					   spdk_bdev_part_complete_zcopy_io, bdev_io);

					   bdev_part_complete_zcopy_io, bdev_io);

		break;

	default:

		SPDK_ERRLOG("unknown I/O type %d\n", bdev_io->type);
@@ -386,7 +386,7 @@ spdk_bdev_part_submit_request(struct spdk_bdev_part_channel *ch, struct spdk_bde 
}



static int

spdk_bdev_part_channel_create_cb(void *io_device, void *ctx_buf)

bdev_part_channel_create_cb(void *io_device, void *ctx_buf)

{

	struct spdk_bdev_part *part = (struct spdk_bdev_part *)io_device;

	struct spdk_bdev_part_channel *ch = ctx_buf;
@@ -405,7 +405,7 @@ spdk_bdev_part_channel_create_cb(void *io_device, void *ctx_buf) 
}



static void

spdk_bdev_part_channel_destroy_cb(void *io_device, void *ctx_buf)

bdev_part_channel_destroy_cb(void *io_device, void *ctx_buf)

{

	struct spdk_bdev_part *part = (struct spdk_bdev_part *)io_device;

	struct spdk_bdev_part_channel *ch = ctx_buf;
@@ -432,8 +432,8 @@ struct spdk_bdev_part_base * 
		SPDK_ERRLOG("Memory allocation failure\n");

		return NULL;

	}

	fn_table->get_io_channel = spdk_bdev_part_get_io_channel;

	fn_table->io_type_supported = spdk_bdev_part_io_type_supported;

	fn_table->get_io_channel = bdev_part_get_io_channel;

	fn_table->io_type_supported = bdev_part_io_type_supported;



	base->bdev = bdev;

	base->desc = NULL;
@@ -512,8 +512,8 @@ spdk_bdev_part_construct(struct spdk_bdev_part *part, struct spdk_bdev_part_base 
		base->claimed = true;

	}



	spdk_io_device_register(part, spdk_bdev_part_channel_create_cb,

				spdk_bdev_part_channel_destroy_cb,

	spdk_io_device_register(part, bdev_part_channel_create_cb,

				bdev_part_channel_destroy_cb,

				base->channel_size,

				name);

lib/blob/blobstore.c

+10 −10
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 


#define BLOB_CRC32C_INITIAL    0xffffffffUL



static int spdk_bs_register_md_thread(struct spdk_blob_store *bs);

static int spdk_bs_unregister_md_thread(struct spdk_blob_store *bs);

static int bs_register_md_thread(struct spdk_blob_store *bs);

static int bs_unregister_md_thread(struct spdk_blob_store *bs);

static void _spdk_blob_close_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno);

static void _spdk_blob_insert_cluster_on_md_thread(struct spdk_blob *blob, uint32_t cluster_num,

		uint64_t cluster, uint32_t extent, spdk_blob_op_complete cb_fn, void *cb_arg);
@@ -1537,7 +1537,7 @@ struct spdk_blob_persist_ctx { 
};



static void

spdk_bs_batch_clear_dev(struct spdk_blob_persist_ctx *ctx, spdk_bs_batch_t *batch, uint64_t lba,

bs_batch_clear_dev(struct spdk_blob_persist_ctx *ctx, spdk_bs_batch_t *batch, uint64_t lba,

		   uint32_t lba_count)

{

	switch (ctx->blob->clear_method) {
@@ -1671,7 +1671,7 @@ _spdk_blob_persist_clear_clusters(spdk_bs_sequence_t *seq, void *cb_arg, int bse 


		/* If a run of LBAs previously existing, clear them now */

		if (lba_count > 0) {

			spdk_bs_batch_clear_dev(ctx, batch, lba, lba_count);

			bs_batch_clear_dev(ctx, batch, lba, lba_count);

		}



		/* Start building the next batch */
@@ -1685,7 +1685,7 @@ _spdk_blob_persist_clear_clusters(spdk_bs_sequence_t *seq, void *cb_arg, int bse 


	/* If we ended with a contiguous set of LBAs, clear them now */

	if (lba_count > 0) {

		spdk_bs_batch_clear_dev(ctx, batch, lba, lba_count);

		bs_batch_clear_dev(ctx, batch, lba, lba_count);

	}



	bs_batch_close(batch);
@@ -3055,7 +3055,7 @@ _spdk_bs_free(struct spdk_blob_store *bs) 
{

	_spdk_bs_blob_list_free(bs);



	spdk_bs_unregister_md_thread(bs);

	bs_unregister_md_thread(bs);

	spdk_io_device_unregister(bs, _spdk_bs_dev_destroy);

}
@@ -3145,7 +3145,7 @@ _spdk_bs_alloc(struct spdk_bs_dev *dev, struct spdk_bs_opts *opts, struct spdk_b 


	spdk_io_device_register(bs, _spdk_bs_channel_create, _spdk_bs_channel_destroy,

				sizeof(struct spdk_bs_channel), "blobstore");

	rc = spdk_bs_register_md_thread(bs);

	rc = bs_register_md_thread(bs);

	if (rc == -1) {

		spdk_io_device_unregister(bs, NULL);

		pthread_mutex_destroy(&bs->used_clusters_mutex);
@@ -5100,7 +5100,7 @@ spdk_bs_total_data_cluster_count(struct spdk_blob_store *bs) 
}



static int

spdk_bs_register_md_thread(struct spdk_blob_store *bs)

bs_register_md_thread(struct spdk_blob_store *bs)

{

	bs->md_channel = spdk_get_io_channel(bs);

	if (!bs->md_channel) {
@@ -5112,7 +5112,7 @@ spdk_bs_register_md_thread(struct spdk_blob_store *bs) 
}



static int

spdk_bs_unregister_md_thread(struct spdk_blob_store *bs)

bs_unregister_md_thread(struct spdk_blob_store *bs)

{

	spdk_put_io_channel(bs->md_channel);

lib/blob/request.c

+12 −12
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno) 
}



static void

spdk_bs_request_set_complete(struct spdk_bs_request_set *set)

bs_request_set_complete(struct spdk_bs_request_set *set)

{

	struct spdk_bs_cpl cpl = set->cpl;

	int bserrno = set->bserrno;
@@ -91,7 +91,7 @@ spdk_bs_request_set_complete(struct spdk_bs_request_set *set) 
}



static void

spdk_bs_sequence_completion(struct spdk_io_channel *channel, void *cb_arg, int bserrno)

bs_sequence_completion(struct spdk_io_channel *channel, void *cb_arg, int bserrno)

{

	struct spdk_bs_request_set *set = cb_arg;
@@ -118,7 +118,7 @@ bs_sequence_start(struct spdk_io_channel *_channel, 
	set->bserrno = 0;

	set->channel = channel;



	set->cb_args.cb_fn = spdk_bs_sequence_completion;

	set->cb_args.cb_fn = bs_sequence_completion;

	set->cb_args.cb_arg = set;

	set->cb_args.channel = channel->dev_channel;
@@ -253,7 +253,7 @@ bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno) 
	if (bserrno != 0) {

		seq->bserrno = bserrno;

	}

	spdk_bs_request_set_complete((struct spdk_bs_request_set *)seq);

	bs_request_set_complete((struct spdk_bs_request_set *)seq);

}



void
@@ -265,7 +265,7 @@ bs_user_op_sequence_finish(void *cb_arg, int bserrno) 
}



static void

spdk_bs_batch_completion(struct spdk_io_channel *_channel,

bs_batch_completion(struct spdk_io_channel *_channel,

		    void *cb_arg, int bserrno)

{

	struct spdk_bs_request_set	*set = cb_arg;
@@ -277,10 +277,10 @@ spdk_bs_batch_completion(struct spdk_io_channel *_channel, 


	if (set->u.batch.outstanding_ops == 0 && set->u.batch.batch_closed) {

		if (set->u.batch.cb_fn) {

			set->cb_args.cb_fn = spdk_bs_sequence_completion;

			set->cb_args.cb_fn = bs_sequence_completion;

			set->u.batch.cb_fn((spdk_bs_sequence_t *)set, set->u.batch.cb_arg, bserrno);

		} else {

			spdk_bs_request_set_complete(set);

			bs_request_set_complete(set);

		}

	}

}
@@ -309,7 +309,7 @@ bs_batch_open(struct spdk_io_channel *_channel, 
	set->u.batch.outstanding_ops = 0;

	set->u.batch.batch_closed = 0;



	set->cb_args.cb_fn = spdk_bs_batch_completion;

	set->cb_args.cb_fn = bs_batch_completion;

	set->cb_args.cb_arg = set;

	set->cb_args.channel = channel->dev_channel;
@@ -396,10 +396,10 @@ bs_batch_close(spdk_bs_batch_t *batch) 


	if (set->u.batch.outstanding_ops == 0) {

		if (set->u.batch.cb_fn) {

			set->cb_args.cb_fn = spdk_bs_sequence_completion;

			set->cb_args.cb_fn = bs_sequence_completion;

			set->u.batch.cb_fn((spdk_bs_sequence_t *)set, set->u.batch.cb_arg, set->bserrno);

		} else {

			spdk_bs_request_set_complete(set);

			bs_request_set_complete(set);

		}

	}

}
@@ -414,7 +414,7 @@ bs_sequence_to_batch(spdk_bs_sequence_t *seq, spdk_bs_sequence_cpl cb_fn, void * 
	set->u.batch.outstanding_ops = 0;

	set->u.batch.batch_closed = 0;



	set->cb_args.cb_fn = spdk_bs_batch_completion;

	set->cb_args.cb_fn = bs_batch_completion;



	return set;

}