Commit d52dbda2 authored by Jim Harris's avatar Jim Harris Committed by Daniel Verkamp
Browse files

blob: rename bs_md functions 



As part of clarifying the API and preparing for some
future changes, rename the following functions:

spdk_bs_md_create_blob => spdk_bs_create_blob
spdk_bs_md_open_blob => spdk_bs_open_blob
spdk_bs_md_delete_blob => spdk_bs_delete_blob
spdk_bs_md_iter_first => spdk_bs_iter_first
spdk_bs_md_iter_next => spdk_bs_iter_next

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I86bf792717b68379484a6108396bb891fe1c221e

Reviewed-on: https://review.gerrithub.io/391031


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
parent 79328473

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line
@@ -46,6 +46,11 @@ spdk_bs_md_get_xattr_names => spdk_blob_get_xattr_names 
spdk_bs_md_get_xattr_value => spdk_blob_get_xattr_value

spdk_blob_md_set_xattr => spdk_blob_set_xattr

spdk_blob_md_remove_xattr => spdk_blob_remove_xattr

spdk_bs_md_create_blob => spdk_bs_create_blob

spdk_bs_md_open_blob => spdk_bs_open_blob

spdk_bs_md_delete_blob => spdk_bs_delete_blob

spdk_bs_md_iter_first => spdk_bs_iter_first

spdk_bs_md_iter_next => spdk_bs_iter_next



## v17.10: Logical Volumes

examples/blob/cli/blobcli.c

+11 −13
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ blob_create_cb(void *arg1, spdk_blob_id blobid, int bserrno) 
	}



	/* We have to open the blob before we can do things like resize. */

	spdk_bs_md_open_blob(cli_context->bs, cli_context->blobid,

	spdk_bs_open_blob(cli_context->bs, cli_context->blobid,

			  open_now_resize_cb, cli_context);

}
@@ -519,8 +519,7 @@ blob_iter_cb(void *arg1, struct spdk_blob *blob, int bserrno) 
		show_blob(cli_context);

	}



	spdk_bs_md_iter_next(cli_context->bs, &blob, blob_iter_cb,

			     cli_context);

	spdk_bs_iter_next(cli_context->bs, &blob, blob_iter_cb, cli_context);

}



/*
@@ -822,26 +821,25 @@ load_bs_cb(void *arg1, struct spdk_blob_store *bs, int bserrno) 
		spdk_bs_get_super(cli_context->bs, show_bs_cb, cli_context);

		break;

	case CLI_CREATE_BLOB:

		spdk_bs_md_create_blob(cli_context->bs, blob_create_cb,

				       cli_context);

		spdk_bs_create_blob(cli_context->bs, blob_create_cb, cli_context);

		break;

	case CLI_SET_XATTR:

	case CLI_REM_XATTR:

		spdk_bs_md_open_blob(cli_context->bs, cli_context->blobid,

		spdk_bs_open_blob(cli_context->bs, cli_context->blobid,

				  set_xattr_cb, cli_context);

		break;

	case CLI_SHOW_BLOB:

	case CLI_LIST_BLOBS:

		spdk_bs_md_iter_first(cli_context->bs, blob_iter_cb, cli_context);

		spdk_bs_iter_first(cli_context->bs, blob_iter_cb, cli_context);



		break;

	case CLI_DUMP_BLOB:

	case CLI_IMPORT_BLOB:

		spdk_bs_md_open_blob(cli_context->bs, cli_context->blobid,

		spdk_bs_open_blob(cli_context->bs, cli_context->blobid,

				  dump_imp_open_cb, cli_context);

		break;

	case CLI_FILL:

		spdk_bs_md_open_blob(cli_context->bs, cli_context->blobid,

		spdk_bs_open_blob(cli_context->bs, cli_context->blobid,

				  fill_blob_cb, cli_context);

		break;

examples/blob/hello_world/hello_blob.c

+5 −6
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ delete_blob(void *arg1, int bserrno) 
		return;

	}



	spdk_bs_md_delete_blob(hello_context->bs, hello_context->blobid,

	spdk_bs_delete_blob(hello_context->bs, hello_context->blobid,

			    delete_complete, hello_context);

}
@@ -339,7 +339,7 @@ blob_create_complete(void *arg1, spdk_blob_id blobid, int bserrno) 
	SPDK_NOTICELOG("new blob id %" PRIu64 "\n", hello_context->blobid);



	/* We have to open the blob before we can do things like resize. */

	spdk_bs_md_open_blob(hello_context->bs, hello_context->blobid,

	spdk_bs_open_blob(hello_context->bs, hello_context->blobid,

			  open_complete, hello_context);

}
@@ -350,8 +350,7 @@ static void 
create_blob(struct hello_context_t *hello_context)

{

	SPDK_NOTICELOG("entry\n");

	spdk_bs_md_create_blob(hello_context->bs, blob_create_complete,

			       hello_context);

	spdk_bs_create_blob(hello_context->bs, blob_create_complete, hello_context);

}



/*

include/spdk/blob.h

+10 −10
Original line number Diff line number Diff line
@@ -207,15 +207,15 @@ uint64_t spdk_blob_get_num_pages(struct spdk_blob *blob); 
uint64_t spdk_blob_get_num_clusters(struct spdk_blob *blob);



/* Create a new blob with initial size of 'sz' clusters. */

void spdk_bs_md_create_blob(struct spdk_blob_store *bs,

void spdk_bs_create_blob(struct spdk_blob_store *bs,

			 spdk_blob_op_with_id_complete cb_fn, void *cb_arg);



/* Delete an existing blob. */

void spdk_bs_md_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

void spdk_bs_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

			 spdk_blob_op_complete cb_fn, void *cb_arg);



/* Open a blob */

void spdk_bs_md_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

void spdk_bs_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

		       spdk_blob_op_with_handle_complete cb_fn, void *cb_arg);



/* Resize a blob to 'sz' clusters.
@@ -267,9 +267,9 @@ void spdk_bs_io_write_zeroes_blob(struct spdk_blob *blob, struct spdk_io_channel 
				  uint64_t offset, uint64_t length, spdk_blob_op_complete cb_fn, void *cb_arg);



/* Iterate through all blobs */

void spdk_bs_md_iter_first(struct spdk_blob_store *bs,

void spdk_bs_iter_first(struct spdk_blob_store *bs,

			spdk_blob_op_with_handle_complete cb_fn, void *cb_arg);

void spdk_bs_md_iter_next(struct spdk_blob_store *bs, struct spdk_blob **blob,

void spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob **blob,

		       spdk_blob_op_with_handle_complete cb_fn, void *cb_arg);



int spdk_blob_set_xattr(struct spdk_blob *blob, const char *name, const void *value,

lib/blob/blobstore.c

+27 −24
Original line number Diff line number Diff line
@@ -2582,10 +2582,10 @@ uint64_t spdk_blob_get_num_clusters(struct spdk_blob *_blob) 
	return blob->active.num_clusters;

}



/* START spdk_bs_md_create_blob */

/* START spdk_bs_create_blob */



static void

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

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

{

	struct spdk_blob_data *blob = cb_arg;
@@ -2594,7 +2594,7 @@ _spdk_bs_md_create_blob_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) 
	spdk_bs_sequence_finish(seq, bserrno);

}



void spdk_bs_md_create_blob(struct spdk_blob_store *bs,

void spdk_bs_create_blob(struct spdk_blob_store *bs,

			 spdk_blob_op_with_id_complete cb_fn, void *cb_arg)

{

	struct spdk_blob_data	*blob;
@@ -2632,10 +2632,10 @@ void spdk_bs_md_create_blob(struct spdk_blob_store *bs, 
		return;

	}



	_spdk_blob_persist(seq, blob, _spdk_bs_md_create_blob_cpl, blob);

	_spdk_blob_persist(seq, blob, _spdk_bs_create_blob_cpl, blob);

}



/* END spdk_bs_md_create_blob */

/* END spdk_bs_create_blob */



/* START spdk_blob_resize */

int
@@ -2667,10 +2667,10 @@ spdk_blob_resize(struct spdk_blob *_blob, uint64_t sz) 
/* END spdk_blob_resize */





/* START spdk_bs_md_delete_blob */

/* START spdk_bs_delete_blob */



static void

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

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

{

	struct spdk_blob_data *blob = cb_arg;
@@ -2680,7 +2680,7 @@ _spdk_bs_md_delete_blob_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) 
}



static void

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

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

{

	struct spdk_blob_data *blob = cb_arg;
@@ -2693,11 +2693,11 @@ _spdk_bs_md_delete_open_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) 
	blob->active.num_pages = 0;

	_spdk_resize_blob(blob, 0);



	_spdk_blob_persist(seq, blob, _spdk_bs_md_delete_blob_cpl, blob);

	_spdk_blob_persist(seq, blob, _spdk_bs_delete_blob_cpl, blob);

}



void

spdk_bs_md_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

spdk_bs_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

		    spdk_blob_op_complete cb_fn, void *cb_arg)

{

	struct spdk_blob_data	*blob;
@@ -2730,15 +2730,15 @@ spdk_bs_md_delete_blob(struct spdk_blob_store *bs, spdk_blob_id blobid, 
		return;

	}



	_spdk_blob_load(seq, blob, _spdk_bs_md_delete_open_cpl, blob);

	_spdk_blob_load(seq, blob, _spdk_bs_delete_open_cpl, blob);

}



/* END spdk_bs_md_delete_blob */

/* END spdk_bs_delete_blob */



/* START spdk_bs_md_open_blob */

/* START spdk_bs_open_blob */



static void

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

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

{

	struct spdk_blob_data *blob = cb_arg;
@@ -2756,7 +2756,7 @@ _spdk_bs_md_open_blob_cpl(spdk_bs_sequence_t *seq, void *cb_arg, int bserrno) 
	spdk_bs_sequence_finish(seq, bserrno);

}



void spdk_bs_md_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

void spdk_bs_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid,

		       spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)

{

	struct spdk_blob_data		*blob;
@@ -2798,10 +2798,13 @@ void spdk_bs_md_open_blob(struct spdk_blob_store *bs, spdk_blob_id blobid, 
		return;

	}



	_spdk_blob_load(seq, blob, _spdk_bs_md_open_blob_cpl, blob);

	_spdk_blob_load(seq, blob, _spdk_bs_open_blob_cpl, blob);

}



/* END spdk_bs_open_blob */



/* START spdk_blob_sync_md */



static void

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

{
@@ -3001,11 +3004,11 @@ _spdk_bs_iter_cpl(void *cb_arg, struct spdk_blob *_blob, int bserrno) 
		return;

	}



	spdk_bs_md_open_blob(bs, id, _spdk_bs_iter_cpl, ctx);

	spdk_bs_open_blob(bs, id, _spdk_bs_iter_cpl, ctx);

}



void

spdk_bs_md_iter_first(struct spdk_blob_store *bs,

spdk_bs_iter_first(struct spdk_blob_store *bs,

		   spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)

{

	struct spdk_bs_iter_ctx *ctx;
@@ -3033,7 +3036,7 @@ _spdk_bs_iter_close_cpl(void *cb_arg, int bserrno) 
}



void

spdk_bs_md_iter_next(struct spdk_blob_store *bs, struct spdk_blob **b,

spdk_bs_iter_next(struct spdk_blob_store *bs, struct spdk_blob **b,

		  spdk_blob_op_with_handle_complete cb_fn, void *cb_arg)

{

	struct spdk_bs_iter_ctx *ctx;