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

lvol: switch to uuid_generate() 



Rather than explicitly asking for time-based UUIDs, let libuuid choose
the best available UUID source (high-quality random number based if
available, or time-based if not).

Change-Id: Ic2f538890f86d3158b64f5884708439b72c373f6
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/402963


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent 76c50183

lib/lvol/lvol.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ spdk_lvs_init(struct spdk_bs_dev *bs_dev, struct spdk_lvs_opts *o, 
		return -ENOMEM;

	}



	uuid_generate_time(lvs->uuid);

	uuid_generate(lvs->uuid);

	strncpy(lvs->name, o->name, SPDK_LVS_NAME_MAX);



	rc = _spdk_add_lvs_to_list(lvs);

test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c

+5 −5
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ ut_lvs_destroy(void) 
	lvs = g_lvol_store;

	g_lvol_store = NULL;



	uuid_generate_time(lvs->uuid);

	uuid_generate(lvs->uuid);



	/* Suuccessfully create lvol, which should be unloaded with lvs later */

	g_lvolerrno = -1;
@@ -653,7 +653,7 @@ ut_lvol_init(void) 
	g_lvs_bdev->lvs = g_lvs;

	g_lvs_bdev->bdev = g_base_bdev;



	uuid_generate_time(g_lvs->uuid);

	uuid_generate(g_lvs->uuid);



	TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores);
@@ -821,7 +821,7 @@ ut_lvol_rename(void) 
	g_lvs_bdev->lvs = g_lvs;

	g_lvs_bdev->bdev = g_base_bdev;



	uuid_generate_time(g_lvs->uuid);

	uuid_generate(g_lvs->uuid);



	TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores);
@@ -896,7 +896,7 @@ ut_lvol_resize(void) 
	g_lvs_bdev->lvs = g_lvs;

	g_lvs_bdev->bdev = g_base_bdev;



	uuid_generate_time(g_lvs->uuid);

	uuid_generate(g_lvs->uuid);

	g_base_bdev->blocklen = 4096;

	TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores);
@@ -964,7 +964,7 @@ ut_lvs_unload(void) 
	lvs = g_lvol_store;

	g_lvol_store = NULL;



	uuid_generate_time(lvs->uuid);

	uuid_generate(lvs->uuid);



	/* Suuccessfully create lvol, which should be destroyed with lvs later */

	g_lvolerrno = -1;