Commit 778e21aa authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

blob/bdev: Factor out the common blob_bdev initialization 



Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: Icdcc8b57198cd697921b025edfc8ba8f61bf0764
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4691


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 94d6e332

module/blob/bdev/blob_bdev.c

+25 −30
Original line number Diff line number Diff line
@@ -319,6 +319,29 @@ bdev_blob_destroy(struct spdk_bs_dev *bs_dev) 
	free(bs_dev);

}



static void

blob_bdev_init(struct blob_bdev *b, struct spdk_bdev_desc *desc)

{

	struct spdk_bdev *bdev;



	bdev = spdk_bdev_desc_get_bdev(desc);

	assert(bdev != NULL);



	b->bdev = bdev;

	b->desc = desc;

	b->bs_dev.blockcnt = spdk_bdev_get_num_blocks(bdev);

	b->bs_dev.blocklen = spdk_bdev_get_block_size(bdev);

	b->bs_dev.create_channel = bdev_blob_create_channel;

	b->bs_dev.destroy_channel = bdev_blob_destroy_channel;

	b->bs_dev.destroy = bdev_blob_destroy;

	b->bs_dev.read = bdev_blob_read;

	b->bs_dev.write = bdev_blob_write;

	b->bs_dev.readv = bdev_blob_readv;

	b->bs_dev.writev = bdev_blob_writev;

	b->bs_dev.write_zeroes = bdev_blob_write_zeroes;

	b->bs_dev.unmap = bdev_blob_unmap;

}



struct spdk_bs_dev *

spdk_bdev_create_bs_dev(struct spdk_bdev *bdev, spdk_bdev_remove_cb_t remove_cb, void *remove_ctx)

{
@@ -339,19 +362,7 @@ spdk_bdev_create_bs_dev(struct spdk_bdev *bdev, spdk_bdev_remove_cb_t remove_cb, 
		return NULL;

	}



	b->bdev = bdev;

	b->desc = desc;

	b->bs_dev.blockcnt = spdk_bdev_get_num_blocks(bdev);

	b->bs_dev.blocklen = spdk_bdev_get_block_size(bdev);

	b->bs_dev.create_channel = bdev_blob_create_channel;

	b->bs_dev.destroy_channel = bdev_blob_destroy_channel;

	b->bs_dev.destroy = bdev_blob_destroy;

	b->bs_dev.read = bdev_blob_read;

	b->bs_dev.write = bdev_blob_write;

	b->bs_dev.readv = bdev_blob_readv;

	b->bs_dev.writev = bdev_blob_writev;

	b->bs_dev.write_zeroes = bdev_blob_write_zeroes;

	b->bs_dev.unmap = bdev_blob_unmap;

	blob_bdev_init(b, desc);



	return &b->bs_dev;

}
@@ -360,7 +371,6 @@ struct spdk_bs_dev * 
spdk_bdev_create_bs_dev_from_desc(struct spdk_bdev_desc *desc)

{

	struct blob_bdev *b;

	struct spdk_bdev *bdev;



	b = calloc(1, sizeof(*b));
@@ -369,22 +379,7 @@ spdk_bdev_create_bs_dev_from_desc(struct spdk_bdev_desc *desc) 
		return NULL;

	}



	bdev = spdk_bdev_desc_get_bdev(desc);

	assert(bdev != NULL);



	b->bdev = bdev;

	b->desc = desc;

	b->bs_dev.blockcnt = spdk_bdev_get_num_blocks(bdev);

	b->bs_dev.blocklen = spdk_bdev_get_block_size(bdev);

	b->bs_dev.create_channel = bdev_blob_create_channel;

	b->bs_dev.destroy_channel = bdev_blob_destroy_channel;

	b->bs_dev.destroy = bdev_blob_destroy;

	b->bs_dev.read = bdev_blob_read;

	b->bs_dev.write = bdev_blob_write;

	b->bs_dev.readv = bdev_blob_readv;

	b->bs_dev.writev = bdev_blob_writev;

	b->bs_dev.write_zeroes = bdev_blob_write_zeroes;

	b->bs_dev.unmap = bdev_blob_unmap;

	blob_bdev_init(b, desc);



	return &b->bs_dev;

}