Commit ad7fdd12 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

lib/blob: remove spdk_ from non-public APIs 



We have an unofficial naming convention that the
spdk_ namespace is reserved for public API functions only.
This patch is attempting to bring the blob library into compliance
with that naming convention.

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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Community-CI: Broadcom CI
parent 75365cfa

lib/blob/blob_bs_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ blob_bs_dev_destroy(struct spdk_bs_dev *bs_dev) 




struct spdk_bs_dev *

spdk_bs_create_blob_bs_dev(struct spdk_blob *blob)

bs_create_blob_bs_dev(struct spdk_blob *blob)

{

	struct spdk_blob_bs_dev  *b;

lib/blob/blobstore.c

+165 −165

File changed.

Preview size limit exceeded, changes collapsed.

lib/blob/blobstore.h

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ SPDK_STATIC_ASSERT(sizeof(struct spdk_bs_super_block) == 0x1000, "Invalid super 


#pragma pack(pop)



struct spdk_bs_dev *spdk_bs_create_zeroes_dev(void);

struct spdk_bs_dev *spdk_bs_create_blob_bs_dev(struct spdk_blob *blob);

struct spdk_bs_dev *bs_create_zeroes_dev(void);

struct spdk_bs_dev *bs_create_blob_bs_dev(struct spdk_blob *blob);



/* Unit Conversions

 *

lib/blob/request.c

+46 −46
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include "spdk_internal/log.h"



void

spdk_bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno)

bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno)

{

	switch (cpl->type) {

	case SPDK_BS_CPL_TYPE_BS_BASIC:
@@ -87,7 +87,7 @@ spdk_bs_request_set_complete(struct spdk_bs_request_set *set) 


	TAILQ_INSERT_TAIL(&set->channel->reqs, set, link);



	spdk_bs_call_cpl(&cpl, bserrno);

	bs_call_cpl(&cpl, bserrno);

}



static void
@@ -100,7 +100,7 @@ spdk_bs_sequence_completion(struct spdk_io_channel *channel, void *cb_arg, int b 
}



spdk_bs_sequence_t *

spdk_bs_sequence_start(struct spdk_io_channel *_channel,

bs_sequence_start(struct spdk_io_channel *_channel,

		  struct spdk_bs_cpl *cpl)

{

	struct spdk_bs_channel		*channel;
@@ -126,7 +126,7 @@ spdk_bs_sequence_start(struct spdk_io_channel *_channel, 
}



void

spdk_bs_sequence_read_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

bs_sequence_read_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

			void *payload, uint64_t lba, uint32_t lba_count,

			spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -143,7 +143,7 @@ spdk_bs_sequence_read_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev 
}



void

spdk_bs_sequence_read_dev(spdk_bs_sequence_t *seq, void *payload,

bs_sequence_read_dev(spdk_bs_sequence_t *seq, void *payload,

		     uint64_t lba, uint32_t lba_count,

		     spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -160,7 +160,7 @@ spdk_bs_sequence_read_dev(spdk_bs_sequence_t *seq, void *payload, 
}



void

spdk_bs_sequence_write_dev(spdk_bs_sequence_t *seq, void *payload,

bs_sequence_write_dev(spdk_bs_sequence_t *seq, void *payload,

		      uint64_t lba, uint32_t lba_count,

		      spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -178,7 +178,7 @@ spdk_bs_sequence_write_dev(spdk_bs_sequence_t *seq, void *payload, 
}



void

spdk_bs_sequence_readv_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

bs_sequence_readv_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

			 struct iovec *iov, int iovcnt, uint64_t lba, uint32_t lba_count,

			 spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -196,7 +196,7 @@ spdk_bs_sequence_readv_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_de 
}



void

spdk_bs_sequence_readv_dev(spdk_bs_sequence_t *seq, struct iovec *iov, int iovcnt,

bs_sequence_readv_dev(spdk_bs_sequence_t *seq, struct iovec *iov, int iovcnt,

		      uint64_t lba, uint32_t lba_count, spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{

	struct spdk_bs_request_set      *set = (struct spdk_bs_request_set *)seq;
@@ -212,7 +212,7 @@ spdk_bs_sequence_readv_dev(spdk_bs_sequence_t *seq, struct iovec *iov, int iovcn 
}



void

spdk_bs_sequence_writev_dev(spdk_bs_sequence_t *seq, struct iovec *iov, int iovcnt,

bs_sequence_writev_dev(spdk_bs_sequence_t *seq, struct iovec *iov, int iovcnt,

		       uint64_t lba, uint32_t lba_count,

		       spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -248,7 +248,7 @@ spdk_bs_sequence_unmap_dev(spdk_bs_sequence_t *seq, 
}



void

spdk_bs_sequence_write_zeroes_dev(spdk_bs_sequence_t *seq,

bs_sequence_write_zeroes_dev(spdk_bs_sequence_t *seq,

			     uint64_t lba, uint32_t lba_count,

			     spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{
@@ -266,7 +266,7 @@ spdk_bs_sequence_write_zeroes_dev(spdk_bs_sequence_t *seq, 
}



void

spdk_bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno)

bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno)

{

	if (bserrno != 0) {

		seq->bserrno = bserrno;
@@ -275,11 +275,11 @@ spdk_bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno) 
}



void

spdk_bs_user_op_sequence_finish(void *cb_arg, int bserrno)

bs_user_op_sequence_finish(void *cb_arg, int bserrno)

{

	spdk_bs_sequence_t *seq = cb_arg;



	spdk_bs_sequence_finish(seq, bserrno);

	bs_sequence_finish(seq, bserrno);

}



static void
@@ -304,7 +304,7 @@ spdk_bs_batch_completion(struct spdk_io_channel *_channel, 
}



spdk_bs_batch_t *

spdk_bs_batch_open(struct spdk_io_channel *_channel,

bs_batch_open(struct spdk_io_channel *_channel,

	      struct spdk_bs_cpl *cpl)

{

	struct spdk_bs_channel		*channel;
@@ -349,7 +349,7 @@ spdk_bs_batch_read_bs_dev(spdk_bs_batch_t *batch, struct spdk_bs_dev *bs_dev, 
}



void

spdk_bs_batch_read_dev(spdk_bs_batch_t *batch, void *payload,

bs_batch_read_dev(spdk_bs_batch_t *batch, void *payload,

		  uint64_t lba, uint32_t lba_count)

{

	struct spdk_bs_request_set	*set = (struct spdk_bs_request_set *)batch;
@@ -363,7 +363,7 @@ spdk_bs_batch_read_dev(spdk_bs_batch_t *batch, void *payload, 
}



void

spdk_bs_batch_write_dev(spdk_bs_batch_t *batch, void *payload,

bs_batch_write_dev(spdk_bs_batch_t *batch, void *payload,

		   uint64_t lba, uint32_t lba_count)

{

	struct spdk_bs_request_set	*set = (struct spdk_bs_request_set *)batch;
@@ -377,7 +377,7 @@ spdk_bs_batch_write_dev(spdk_bs_batch_t *batch, void *payload, 
}



void

spdk_bs_batch_unmap_dev(spdk_bs_batch_t *batch,

bs_batch_unmap_dev(spdk_bs_batch_t *batch,

		   uint64_t lba, uint32_t lba_count)

{

	struct spdk_bs_request_set	*set = (struct spdk_bs_request_set *)batch;
@@ -392,7 +392,7 @@ spdk_bs_batch_unmap_dev(spdk_bs_batch_t *batch, 
}



void

spdk_bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch,

bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch,

			  uint64_t lba, uint32_t lba_count)

{

	struct spdk_bs_request_set	*set = (struct spdk_bs_request_set *)batch;
@@ -406,7 +406,7 @@ spdk_bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch, 
}



void

spdk_bs_batch_close(spdk_bs_batch_t *batch)

bs_batch_close(spdk_bs_batch_t *batch)

{

	struct spdk_bs_request_set	*set = (struct spdk_bs_request_set *)batch;
@@ -423,7 +423,7 @@ spdk_bs_batch_close(spdk_bs_batch_t *batch) 
}



spdk_bs_batch_t *

spdk_bs_sequence_to_batch(spdk_bs_sequence_t *seq, spdk_bs_sequence_cpl cb_fn, void *cb_arg)

bs_sequence_to_batch(spdk_bs_sequence_t *seq, spdk_bs_sequence_cpl cb_fn, void *cb_arg)

{

	struct spdk_bs_request_set *set = (struct spdk_bs_request_set *)seq;
@@ -445,7 +445,7 @@ spdk_bs_batch_to_sequence(spdk_bs_batch_t *batch) 
	set->u.batch.outstanding_ops++;



	set->cpl.type = SPDK_BS_CPL_TYPE_BLOB_BASIC;

	set->cpl.u.blob_basic.cb_fn = spdk_bs_sequence_to_batch_completion;

	set->cpl.u.blob_basic.cb_fn = bs_sequence_to_batch_completion;

	set->cpl.u.blob_basic.cb_arg = set;

	set->bserrno = 0;
@@ -457,7 +457,7 @@ spdk_bs_batch_to_sequence(spdk_bs_batch_t *batch) 
}



spdk_bs_user_op_t *

spdk_bs_user_op_alloc(struct spdk_io_channel *_channel, struct spdk_bs_cpl *cpl,

bs_user_op_alloc(struct spdk_io_channel *_channel, struct spdk_bs_cpl *cpl,

		 enum spdk_blob_op_type op_type, struct spdk_blob *blob,

		 void *payload, int iovcnt, uint64_t offset, uint64_t length)

{
@@ -489,7 +489,7 @@ spdk_bs_user_op_alloc(struct spdk_io_channel *_channel, struct spdk_bs_cpl *cpl, 
}



void

spdk_bs_user_op_execute(spdk_bs_user_op_t *op)

bs_user_op_execute(spdk_bs_user_op_t *op)

{

	struct spdk_bs_request_set	*set;

	struct spdk_bs_user_op_args	*args;
@@ -531,7 +531,7 @@ spdk_bs_user_op_execute(spdk_bs_user_op_t *op) 
}



void

spdk_bs_user_op_abort(spdk_bs_user_op_t *op)

bs_user_op_abort(spdk_bs_user_op_t *op)

{

	struct spdk_bs_request_set	*set;
@@ -542,7 +542,7 @@ spdk_bs_user_op_abort(spdk_bs_user_op_t *op) 
}



void

spdk_bs_sequence_to_batch_completion(void *cb_arg, int bserrno)

bs_sequence_to_batch_completion(void *cb_arg, int bserrno)

{

	struct spdk_bs_request_set *set = (struct spdk_bs_request_set *)cb_arg;

lib/blob/request.h

+46 −46
Original line number Diff line number Diff line
@@ -143,32 +143,32 @@ struct spdk_bs_request_set { 
	TAILQ_ENTRY(spdk_bs_request_set) link;

};



void spdk_bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno);

void bs_call_cpl(struct spdk_bs_cpl *cpl, int bserrno);



spdk_bs_sequence_t *spdk_bs_sequence_start(struct spdk_io_channel *channel,

spdk_bs_sequence_t *bs_sequence_start(struct spdk_io_channel *channel,

				      struct spdk_bs_cpl *cpl);



void spdk_bs_sequence_read_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

void bs_sequence_read_bs_dev(spdk_bs_sequence_t *seq, struct spdk_bs_dev *bs_dev,

			     void *payload, uint64_t lba, uint32_t lba_count,

			     spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_read_dev(spdk_bs_sequence_t *seq, void *payload,

void bs_sequence_read_dev(spdk_bs_sequence_t *seq, void *payload,

			  uint64_t lba, uint32_t lba_count,

			  spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_write_dev(spdk_bs_sequence_t *seq, void *payload,

void bs_sequence_write_dev(spdk_bs_sequence_t *seq, void *payload,

			   uint64_t lba, uint32_t lba_count,

			   spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_readv_bs_dev(spdk_bs_batch_t *batch, struct spdk_bs_dev *bs_dev,

void bs_sequence_readv_bs_dev(spdk_bs_batch_t *batch, struct spdk_bs_dev *bs_dev,

			      struct iovec *iov, int iovcnt, uint64_t lba, uint32_t lba_count,

			      spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_readv_dev(spdk_bs_batch_t *batch, struct iovec *iov, int iovcnt,

void bs_sequence_readv_dev(spdk_bs_batch_t *batch, struct iovec *iov, int iovcnt,

			   uint64_t lba, uint32_t lba_count,

			   spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_writev_dev(spdk_bs_batch_t *batch, struct iovec *iov, int iovcnt,

void bs_sequence_writev_dev(spdk_bs_batch_t *batch, struct iovec *iov, int iovcnt,

			    uint64_t lba, uint32_t lba_count,

			    spdk_bs_sequence_cpl cb_fn, void *cb_arg);
@@ -176,48 +176,48 @@ void spdk_bs_sequence_unmap_dev(spdk_bs_sequence_t *seq, 
				uint64_t lba, uint32_t lba_count,

				spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_write_zeroes_dev(spdk_bs_sequence_t *seq,

void bs_sequence_write_zeroes_dev(spdk_bs_sequence_t *seq,

				  uint64_t lba, uint32_t lba_count,

				  spdk_bs_sequence_cpl cb_fn, void *cb_arg);



void spdk_bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno);

void bs_sequence_finish(spdk_bs_sequence_t *seq, int bserrno);



void spdk_bs_user_op_sequence_finish(void *cb_arg, int bserrno);

void bs_user_op_sequence_finish(void *cb_arg, int bserrno);



spdk_bs_batch_t *spdk_bs_batch_open(struct spdk_io_channel *channel,

spdk_bs_batch_t *bs_batch_open(struct spdk_io_channel *channel,

			       struct spdk_bs_cpl *cpl);



void spdk_bs_batch_read_bs_dev(spdk_bs_batch_t *batch, struct spdk_bs_dev *bs_dev,

			       void *payload, uint64_t lba, uint32_t lba_count);



void spdk_bs_batch_read_dev(spdk_bs_batch_t *batch, void *payload,

void bs_batch_read_dev(spdk_bs_batch_t *batch, void *payload,

		       uint64_t lba, uint32_t lba_count);



void spdk_bs_batch_write_dev(spdk_bs_batch_t *batch, void *payload,

void bs_batch_write_dev(spdk_bs_batch_t *batch, void *payload,

			uint64_t lba, uint32_t lba_count);



void spdk_bs_batch_unmap_dev(spdk_bs_batch_t *batch,

void bs_batch_unmap_dev(spdk_bs_batch_t *batch,

			uint64_t lba, uint32_t lba_count);



void spdk_bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch,

void bs_batch_write_zeroes_dev(spdk_bs_batch_t *batch,

			       uint64_t lba, uint32_t lba_count);



void spdk_bs_batch_close(spdk_bs_batch_t *batch);

void bs_batch_close(spdk_bs_batch_t *batch);



spdk_bs_batch_t *spdk_bs_sequence_to_batch(spdk_bs_sequence_t *seq,

spdk_bs_batch_t *bs_sequence_to_batch(spdk_bs_sequence_t *seq,

				      spdk_bs_sequence_cpl cb_fn,

				      void *cb_arg);



spdk_bs_sequence_t *spdk_bs_batch_to_sequence(spdk_bs_batch_t *batch);



spdk_bs_user_op_t *spdk_bs_user_op_alloc(struct spdk_io_channel *channel, struct spdk_bs_cpl *cpl,

spdk_bs_user_op_t *bs_user_op_alloc(struct spdk_io_channel *channel, struct spdk_bs_cpl *cpl,

				    enum spdk_blob_op_type op_type, struct spdk_blob *blob,

				    void *payload, int iovcnt, uint64_t offset, uint64_t length);



void spdk_bs_user_op_execute(spdk_bs_user_op_t *op);

void bs_user_op_execute(spdk_bs_user_op_t *op);



void spdk_bs_user_op_abort(spdk_bs_user_op_t *op);

void bs_user_op_abort(spdk_bs_user_op_t *op);



void spdk_bs_sequence_to_batch_completion(void *cb_arg, int bserrno);

void bs_sequence_to_batch_completion(void *cb_arg, int bserrno);



#endif