ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lvol: switch to uuid_generate()

Browse Source 
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: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/402963
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Daniel Verkamp 2018-03-06 15:18:57 -07:00 committed by Jim Harris
parent 76c501834e
commit 2532fd8f68
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lvol/lvol.c
View File

@ -584,7 +584,7 @@ spdk_lvs_init(struct spdk_bs_dev *bs_dev, struct spdk_lvs_opts *o,
return -ENOMEM; return -ENOMEM;
} }
uuid_generate_time(lvs->uuid); uuid_generate(lvs->uuid);
strncpy(lvs->name, o->name, SPDK_LVS_NAME_MAX); strncpy(lvs->name, o->name, SPDK_LVS_NAME_MAX);
rc = _spdk_add_lvs_to_list(lvs); rc = _spdk_add_lvs_to_list(lvs);

10
test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
View File

@ -614,7 +614,7 @@ ut_lvs_destroy(void)
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
uuid_generate_time(lvs->uuid); uuid_generate(lvs->uuid);
/* Suuccessfully create lvol, which should be unloaded with lvs later */ /* Suuccessfully create lvol, which should be unloaded with lvs later */
g_lvolerrno = -1; g_lvolerrno = -1;
@ -653,7 +653,7 @@ ut_lvol_init(void)
g_lvs_bdev->lvs = g_lvs; g_lvs_bdev->lvs = g_lvs;
g_lvs_bdev->bdev = g_base_bdev; 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); 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->lvs = g_lvs;
g_lvs_bdev->bdev = g_base_bdev; 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); 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->lvs = g_lvs;
g_lvs_bdev->bdev = g_base_bdev; g_lvs_bdev->bdev = g_base_bdev;
uuid_generate_time(g_lvs->uuid); uuid_generate(g_lvs->uuid);
g_base_bdev->blocklen = 4096; g_base_bdev->blocklen = 4096;
TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores); TAILQ_INSERT_TAIL(&g_spdk_lvol_pairs, g_lvs_bdev, lvol_stores);
@ -964,7 +964,7 @@ ut_lvs_unload(void)
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
uuid_generate_time(lvs->uuid); uuid_generate(lvs->uuid);
/* Suuccessfully create lvol, which should be destroyed with lvs later */ /* Suuccessfully create lvol, which should be destroyed with lvs later */
g_lvolerrno = -1; g_lvolerrno = -1;