From 2532fd8f688f44b2c9cfa085d2a0cd1007c5c159 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 6 Mar 2018 15:18:57 -0700 Subject: [PATCH] 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: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/402963 Tested-by: SPDK Automated Test System Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Maciej Szwed Reviewed-by: Changpeng Liu --- lib/lvol/lvol.c | 2 +- test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/lvol/lvol.c b/lib/lvol/lvol.c index b8e1e1e6a..d7bd10a15 100644 --- a/lib/lvol/lvol.c +++ b/lib/lvol/lvol.c @@ -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); diff --git a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c index 2e20c46cc..600eb9a97 100644 --- a/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c +++ b/test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c @@ -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;