Commit 230857be authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Jim Harris
Browse files

bdev/split: use per-base split tailq 



Currently spdk_bdev_part_base_get_tailq(split_base)
will return the global split tailq containing all
the split bdevs, which is not what callers of this
function expect. E.g. the construct_split_vbdev RPC
returns all split bdevs rather than the ones just
created.

Fix this by having per-split-base tailqs which
contain only associated splits.

Change-Id: I0fc25b28def0404f6a67152b5c21180e71660667
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/434805


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent eb20b890

lib/bdev/split/vbdev_split.c

+5 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct spdk_vbdev_split_config { 
	unsigned split_count;

	uint64_t split_size_mb;



	SPDK_BDEV_PART_TAILQ splits;

	struct spdk_bdev_part_base *split_base;

	bool removed;
@@ -61,7 +62,6 @@ struct spdk_vbdev_split_config { 


static TAILQ_HEAD(, spdk_vbdev_split_config) g_split_config = TAILQ_HEAD_INITIALIZER(

			g_split_config);

static SPDK_BDEV_PART_TAILQ g_split_disks = TAILQ_HEAD_INITIALIZER(g_split_disks);



struct vbdev_split_channel {

	struct spdk_bdev_part_channel	part_ch;
@@ -120,8 +120,9 @@ static void 
vbdev_split_base_bdev_hotremove_cb(void *_part_base)

{

	struct spdk_bdev_part_base *part_base = _part_base;

	struct spdk_vbdev_split_config *cfg = spdk_bdev_part_base_get_ctx(part_base);



	spdk_bdev_part_base_hotremove(part_base, &g_split_disks);

	spdk_bdev_part_base_hotremove(part_base, &cfg->splits);

}



static void
@@ -249,10 +250,11 @@ vbdev_split_create(struct spdk_vbdev_split_config *cfg) 
		      " split_size_blocks: %" PRIu64 "\n",

		      spdk_bdev_get_name(base_bdev), split_count, split_size_blocks);



	TAILQ_INIT(&cfg->splits);

	cfg->split_base = spdk_bdev_part_base_construct(base_bdev,

			  vbdev_split_base_bdev_hotremove_cb,

			  &split_if, &vbdev_split_fn_table,

			  &g_split_disks, vbdev_split_base_free, cfg,

			  &cfg->splits, vbdev_split_base_free, cfg,

			  sizeof(struct vbdev_split_channel), NULL, NULL);

	if (!cfg->split_base) {

		SPDK_ERRLOG("Cannot construct bdev part base\n");