From ed1b4c926cd85cb316b8d24de76194f386e8ab09 Mon Sep 17 00:00:00 2001
From: Krzysztof Karas <krzysztof.karas@intel.com>
Date: Mon, 6 Mar 2023 15:27:09 +0100
Subject: [PATCH] bdev: delete UUID generation from ephemeral bdevs

Ensure no ephemeral bdev will generate its own UUID,
unless this value has been specified via RPC.
Generation is now being done by the bdev layer itself.

Change-Id: I11efe819a28a137b738959a96a7bdf8c79cfaf64
Signed-off-by: Krzysztof Karas <krzysztof.karas@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17109
Community-CI: Mellanox Build Bot
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 module/bdev/daos/bdev_daos.c     | 2 --
 module/bdev/malloc/bdev_malloc.c | 2 --
 module/bdev/null/bdev_null.c     | 2 --
 module/bdev/rbd/bdev_rbd.c       | 2 --
 4 files changed, 8 deletions(-)

diff --git a/module/bdev/daos/bdev_daos.c b/module/bdev/daos/bdev_daos.c
index 0fd8b408d..02c4d43fc 100644
--- a/module/bdev/daos/bdev_daos.c
+++ b/module/bdev/daos/bdev_daos.c
@@ -699,8 +699,6 @@ create_bdev_daos(struct spdk_bdev **bdev,
 
 	if (uuid) {
 		daos->disk.uuid = *uuid;
-	} else {
-		spdk_uuid_generate(&daos->disk.uuid);
 	}
 
 	daos->disk.ctxt = daos;
diff --git a/module/bdev/malloc/bdev_malloc.c b/module/bdev/malloc/bdev_malloc.c
index 95ef07dd6..86c7fed72 100644
--- a/module/bdev/malloc/bdev_malloc.c
+++ b/module/bdev/malloc/bdev_malloc.c
@@ -694,8 +694,6 @@ create_malloc_disk(struct spdk_bdev **bdev, const struct malloc_bdev_opts *opts)
 	}
 	if (!spdk_mem_all_zero(&opts->uuid, sizeof(opts->uuid))) {
 		spdk_uuid_copy(&mdisk->disk.uuid, &opts->uuid);
-	} else {
-		spdk_uuid_generate(&mdisk->disk.uuid);
 	}
 
 	mdisk->disk.max_copy = 0;
diff --git a/module/bdev/null/bdev_null.c b/module/bdev/null/bdev_null.c
index 85049c66c..f98cb1630 100644
--- a/module/bdev/null/bdev_null.c
+++ b/module/bdev/null/bdev_null.c
@@ -295,8 +295,6 @@ bdev_null_create(struct spdk_bdev **bdev, const struct spdk_null_bdev_opts *opts
 	}
 	if (opts->uuid) {
 		null_disk->bdev.uuid = *opts->uuid;
-	} else {
-		spdk_uuid_generate(&null_disk->bdev.uuid);
 	}
 
 	null_disk->bdev.ctxt = null_disk;
diff --git a/module/bdev/rbd/bdev_rbd.c b/module/bdev/rbd/bdev_rbd.c
index 3263d3707..7e51523ca 100644
--- a/module/bdev/rbd/bdev_rbd.c
+++ b/module/bdev/rbd/bdev_rbd.c
@@ -1225,8 +1225,6 @@ bdev_rbd_create(struct spdk_bdev **bdev, const char *name, const char *user_id,
 
 	if (uuid) {
 		rbd->disk.uuid = *uuid;
-	} else {
-		spdk_uuid_generate(&rbd->disk.uuid);
 	}
 
 	if (name) {