Skip to contentSkip to conversation

btrfs-progs: Remove redundant fs uuid validation from make_btrf

PATCH In review Nikolay Borisov 2 participants 2 messages Jan 10, 2022 – Jan 11, 2022 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs-progs: Remove redundant fs uuid validation from make_btrf

cfg->fs_uuid is either 0 or set to the value of the -U parameter passed to mkfs.btrfs. However the value of the latter is already being validated in the main mkfs function. Just remove the duplicated checks in make_btrfs as they effectively can never be executed.

---

v2:
* Properly "copy" the cfg->fs_uuid into the superblock's fsid field. This fixes a failure in 002-uuid-rewrite.

 mkfs/common.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
mkfs/common.c +3 -12
index fec23e64b2b2..9608d27f73e7 100644
@@ -260,20 +260,11 @@ int make_btrfs(int fd, struct btrfs_mkfs_config *cfg)
 	memset(&super, 0, sizeof(super));
 
 	num_bytes = (cfg->num_bytes / cfg->sectorsize) * cfg->sectorsize;
-	if (*cfg->fs_uuid) {
-		if (uuid_parse(cfg->fs_uuid, super.fsid) != 0) {
-			error("cannot not parse UUID: %s", cfg->fs_uuid);
-			ret = -EINVAL;
-			goto out;
-		}
-		if (!test_uuid_unique(cfg->fs_uuid)) {
-			error("non-unique UUID: %s", cfg->fs_uuid);
-			ret = -EBUSY;
-			goto out;
-		}
-	} else {
+	if (!*cfg->fs_uuid) {
 		uuid_generate(super.fsid);
 		uuid_unparse(super.fsid, cfg->fs_uuid);
+	} else {
+		uuid_parse(cfg->fs_uuid, super.fsid);
 	}
 	uuid_generate(super.dev_item.uuid);
 	uuid_generate(chunk_tree_uuid);

--
2.17.1

#1 lore raw
Quoted 11 lines · Nikolay Borisov

cfg->fs_uuid is either 0 or set to the value of the -U parameter passed to mkfs.btrfs. However the value of the latter is already being validated in the main mkfs function. Just remove the duplicated checks in make_btrfs as they effectively can never be executed.

---

v2:
* Properly "copy" the cfg->fs_uuid into the superblock's fsid field. This fixes a failure in 002-uuid-rewrite.

Added to devel, thanks.