Commit c8efd8a8 authored by Jim Harris's avatar Jim Harris
Browse files

blob: revert spdk_blob_data changes 



There was some thinking that we would need to allocate
I/O channels on a per-blob basis to handle dynamic
resizing during I/O.  Making spdk_blob an opaque handle,
with the existing spdk_blob structure renamed to
spdk_blob_data was a first step towards making that
happen.  But more recent work on blobstore has
simplified the resizing approach, so this spdk_blob_data
is no longer needed.  So revert it.

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

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


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent a2c6b716

examples/blob/cli/blobcli.c

+2 −2
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ show_blob(struct cli_context_t *cli_context) 
	 * may be useful for debug of blobstore based applications.

	 */

	printf("\nBlob Private Info:\n");

	switch (__blob_to_data(cli_context->blob)->state) {

	switch (cli_context->blob->state) {

	case SPDK_BLOB_STATE_DIRTY:

		printf("state: DIRTY\n");

		break;
@@ -480,7 +480,7 @@ show_blob(struct cli_context_t *cli_context) 
		break;

	}

	printf("open ref count: %d\n",

	       __blob_to_data(cli_context->blob)->open_ref);

	       cli_context->blob->open_ref);



	spdk_xattr_names_free(names);

}

lib/blob/blobstore.c

+86 −110

File changed.

Preview size limit exceeded, changes collapsed.

lib/blob/blobstore.h

+9 −12
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ enum spdk_blob_state { 


TAILQ_HEAD(spdk_xattr_tailq, spdk_xattr);



struct spdk_blob_data {

struct spdk_blob {

	struct spdk_blob_store *bs;



	uint32_t	open_ref;
@@ -143,12 +143,9 @@ struct spdk_blob_data { 
	struct spdk_xattr_tailq xattrs;

	struct spdk_xattr_tailq xattrs_internal;



	TAILQ_ENTRY(spdk_blob_data) link;

	TAILQ_ENTRY(spdk_blob) link;

};



#define __blob_to_data(x)	((struct spdk_blob_data *)(x))

#define __data_to_blob(x)	((struct spdk_blob *)(x))



struct spdk_blob_store {

	uint64_t			md_start; /* Offset from beginning of disk, in pages */

	uint32_t			md_len; /* Count, in pages */
@@ -178,7 +175,7 @@ struct spdk_blob_store { 
	struct spdk_bs_cpl		unload_cpl;

	int				unload_err;



	TAILQ_HEAD(, spdk_blob_data) 	blobs;

	TAILQ_HEAD(, spdk_blob) 	blobs;

};



struct spdk_bs_channel {
@@ -442,13 +439,13 @@ _spdk_bs_lba_to_cluster(struct spdk_blob_store *bs, uint64_t lba) 
}



static inline uint64_t

_spdk_bs_blob_lba_to_back_dev_lba(struct spdk_blob_data *blob, uint64_t lba)

_spdk_bs_blob_lba_to_back_dev_lba(struct spdk_blob *blob, uint64_t lba)

{

	return lba * blob->bs->dev->blocklen / blob->back_bs_dev->blocklen;

}



static inline uint64_t

_spdk_bs_blob_lba_from_back_dev_lba(struct spdk_blob_data *blob, uint64_t lba)

_spdk_bs_blob_lba_from_back_dev_lba(struct spdk_blob *blob, uint64_t lba)

{

	return lba * blob->back_bs_dev->blocklen / blob->bs->dev->blocklen;

}
@@ -475,7 +472,7 @@ _spdk_bs_page_to_blobid(uint32_t page_idx) 
 * start of that page.

 */

static inline uint64_t

_spdk_bs_blob_page_to_lba(struct spdk_blob_data *blob, uint32_t page)

_spdk_bs_blob_page_to_lba(struct spdk_blob *blob, uint32_t page)

{

	uint64_t	lba;

	uint32_t	pages_per_cluster;
@@ -494,7 +491,7 @@ _spdk_bs_blob_page_to_lba(struct spdk_blob_data *blob, uint32_t page) 
 * next cluster boundary.

 */

static inline uint32_t

_spdk_bs_num_pages_to_cluster_boundary(struct spdk_blob_data *blob, uint32_t page)

_spdk_bs_num_pages_to_cluster_boundary(struct spdk_blob *blob, uint32_t page)

{

	uint32_t	pages_per_cluster;
@@ -505,7 +502,7 @@ _spdk_bs_num_pages_to_cluster_boundary(struct spdk_blob_data *blob, uint32_t pag 


/* Given a page offset into a blob, look up the number of pages into blob to beginning of current cluster */

static inline uint32_t

_spdk_bs_page_to_cluster_start(struct spdk_blob_data *blob, uint32_t page)

_spdk_bs_page_to_cluster_start(struct spdk_blob *blob, uint32_t page)

{

	uint32_t	pages_per_cluster;
@@ -516,7 +513,7 @@ _spdk_bs_page_to_cluster_start(struct spdk_blob_data *blob, uint32_t page) 


/* Given a page offset into a blob, look up if it is from allocated cluster. */

static inline bool

_spdk_bs_page_is_allocated(struct spdk_blob_data *blob, uint32_t page)

_spdk_bs_page_is_allocated(struct spdk_blob *blob, uint32_t page)

{

	uint64_t	lba;

	uint32_t	pages_per_cluster;

test/unit/lib/blob/blob.c/blob_ut.c

+67 −83

File changed.

Preview size limit exceeded, changes collapsed.