Re: [PATCH 08/18] cdev: use more descriptive struct cdev::diskuuid/partuuid

[Marco Felsch <m.felsch@pengutronix.de>]

On 23-05-31, Ahmad Fatoum wrote:
> The UUID field has different meanings:
> 
> For a master cdev:
> 
>   - GPT Header DiskGUID if GPT-formatted
>   - MBR Header NT Disk Signature if MBR-formatted
> 
> For a partition cdev:
> 
>   - GPT UniquePartitionGUID
>   - MBR Header NT Disk Signature followed by "-${partititon_number}"
> 
> Later code will add yet another UUID (Partition Type GUID), so let's
> make existing code more readable by using either diskuuid or partuuid as
> appropriate.
> 
> No functional change.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

Reviewed-by: Marco Felsch <m.felsch@pengutronix.de>

> ---
>  common/bootm.c                 |  2 +-
>  common/partitions.c            |  2 +-
>  common/partitions/dos.c        |  2 +-
>  common/partitions/efi.c        |  4 ++--
>  drivers/misc/storage-by-uuid.c |  4 ++--
>  fs/devfs-core.c                |  4 ++--
>  fs/fs.c                        |  9 +++++----
>  include/driver.h               | 10 +++++++++-
>  8 files changed, 23 insertions(+), 14 deletions(-)
> 
> diff --git a/common/bootm.c b/common/bootm.c
> index 91a6e1688674..791d6b8fbbf1 100644
> --- a/common/bootm.c
> +++ b/common/bootm.c
> @@ -734,7 +734,7 @@ int bootm_boot(struct bootm_data *bootm_data)
>  				if (!root_cdev)
>  					pr_err("no cdev found for %s, cannot set root= option\n",
>  						root_dev_name);
> -				else if (!root_cdev->uuid[0])
> +				else if (!root_cdev->partuuid[0])
>  					pr_err("%s doesn't have a PARTUUID, cannot set root= option\n",
>  						root_dev_name);
>  			}
> diff --git a/common/partitions.c b/common/partitions.c
> index 9cca5c4a1546..b579559672a0 100644
> --- a/common/partitions.c
> +++ b/common/partitions.c
> @@ -51,7 +51,7 @@ static int register_one_partition(struct block_device *blk,
>  	cdev->flags |= DEVFS_PARTITION_FROM_TABLE;
>  
>  	cdev->dos_partition_type = part->dos_partition_type;
> -	strcpy(cdev->uuid, part->partuuid);
> +	strcpy(cdev->partuuid, part->partuuid);
>  
>  	free(partition_name);
>  
> diff --git a/common/partitions/dos.c b/common/partitions/dos.c
> index 566c8dd949b4..ad60c0b27b46 100644
> --- a/common/partitions/dos.c
> +++ b/common/partitions/dos.c
> @@ -183,7 +183,7 @@ static void dos_partition(void *buf, struct block_device *blk,
>  	uint32_t signature = get_unaligned_le32(buf + 0x1b8);
>  
>  	if (signature)
> -		sprintf(blk->cdev.uuid, "%08x", signature);
> +		sprintf(blk->cdev.diskuuid, "%08x", signature);
>  
>  	table = (struct partition_entry *)&buffer[446];
>  
> diff --git a/common/partitions/efi.c b/common/partitions/efi.c
> index a6c95f3969d1..780a8695e8a8 100644
> --- a/common/partitions/efi.c
> +++ b/common/partitions/efi.c
> @@ -446,8 +446,8 @@ static void efi_partition(void *buf, struct block_device *blk,
>  		return;
>  	}
>  
> -	snprintf(blk->cdev.uuid, sizeof(blk->cdev.uuid), "%pUl", &gpt->disk_guid);
> -	dev_add_param_string_fixed(blk->dev, "guid", blk->cdev.uuid);
> +	snprintf(blk->cdev.diskuuid, sizeof(blk->cdev.diskuuid), "%pUl", &gpt->disk_guid);
> +	dev_add_param_string_fixed(blk->dev, "guid", blk->cdev.diskuuid);
>  
>  	nb_part = le32_to_cpu(gpt->num_partition_entries);
>  
> diff --git a/drivers/misc/storage-by-uuid.c b/drivers/misc/storage-by-uuid.c
> index a938bfaaa2c4..a7a66a1421a3 100644
> --- a/drivers/misc/storage-by-uuid.c
> +++ b/drivers/misc/storage-by-uuid.c
> @@ -140,8 +140,8 @@ static void check_exist(struct sbu *sbu)
>  	struct cdev *cdev;
>  
>  	for_each_cdev(cdev) {
> -		if (!strcmp(cdev->uuid, sbu->uuid)) {
> -			dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->uuid);
> +		if (!strcmp(cdev->diskuuid, sbu->uuid)) {
> +			dev_dbg(sbu->dev, "Found %s %s\n", cdev->name, cdev->diskuuid);
>  			storage_by_uuid_add_partitions(sbu, cdev);
>  		}
>  	}
> diff --git a/fs/devfs-core.c b/fs/devfs-core.c
> index bb66993b90f9..a0732dafca42 100644
> --- a/fs/devfs-core.c
> +++ b/fs/devfs-core.c
> @@ -101,7 +101,7 @@ struct cdev *cdev_by_partuuid(const char *partuuid)
>  		return NULL;
>  
>  	for_each_cdev(cdev) {
> -		if (cdev_is_partition(cdev) && !strcasecmp(cdev->uuid, partuuid))
> +		if (cdev_is_partition(cdev) && !strcasecmp(cdev->partuuid, partuuid))
>  			return cdev;
>  	}
>  	return NULL;
> @@ -115,7 +115,7 @@ struct cdev *cdev_by_diskuuid(const char *diskuuid)
>  		return NULL;
>  
>  	for_each_cdev(cdev) {
> -		if (!cdev_is_partition(cdev) && !strcasecmp(cdev->uuid, diskuuid))
> +		if (!cdev_is_partition(cdev) && !strcasecmp(cdev->diskuuid, diskuuid))
>  			return cdev;
>  	}
>  	return NULL;
> diff --git a/fs/fs.c b/fs/fs.c
> index ba60766a065a..1820e48393af 100644
> --- a/fs/fs.c
> +++ b/fs/fs.c
> @@ -104,8 +104,9 @@ void cdev_print(const struct cdev *cdev)
>  		nbytes += printf("Filetype: %s\t", file_type_to_string(cdev->filetype));
>  	if (cdev->dos_partition_type)
>  		nbytes += printf("DOS parttype: 0x%02x\t", cdev->dos_partition_type);
> -	if (*cdev->uuid)
> -		nbytes += printf("UUID: %s", cdev->uuid);
> +	if (*cdev->partuuid || *cdev->diskuuid)
> +		nbytes += printf("%sUUID: %s", cdev_is_partition(cdev) ? "PART" : "DISK",
> +				 cdev_is_partition(cdev) ? cdev->partuuid : cdev->diskuuid);
>  
>  	if (nbytes)
>  		printf("\n");
> @@ -3061,8 +3062,8 @@ char *cdev_get_linux_rootarg(const struct cdev *cdev)
>  	if (str)
>  		return str;
>  
> -	if (cdev->uuid[0] != 0)
> -		return basprintf("root=PARTUUID=%s", cdev->uuid);
> +	if (cdev->partuuid[0] != 0)
> +		return basprintf("root=PARTUUID=%s", cdev->partuuid);
>  
>  	return NULL;
>  }
> diff --git a/include/driver.h b/include/driver.h
> index 00b4a0e4af75..42e513a15603 100644
> --- a/include/driver.h
> +++ b/include/driver.h
> @@ -522,7 +522,15 @@ struct cdev {
>  	char *partname; /* the partition name, usually the above without the
>  			 * device part, i.e. name = "nand0.barebox" -> partname = "barebox"
>  			 */
> -	char uuid[MAX_UUID_STR];
> +	union {
> +		char diskuuid[MAX_UUID_STR];	/* GPT Header DiskGUID or
> +						 * MBR Header NT Disk Signature
> +						 */
> +		char partuuid[MAX_UUID_STR];	/* GPT Partition Entry UniquePartitionGUID or
> +						 * MBR Partition Entry "${nt_signature}-${partno}"
> +						 */
> +	};
> +
>  	loff_t offset;
>  	loff_t size;
>  	unsigned int flags;
> -- 
> 2.39.2
> 
> 
>