From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: Marco Felsch <m.felsch@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 16/18] cdev: use cdev::dos_partition_type only if cdev_is_mbr_partitioned
Date: Thu, 1 Jun 2023 07:30:54 +0200 [thread overview]
Message-ID: <0ee97e12-50a5-2e28-69fd-3a42d2ab9868@pengutronix.de> (raw)
In-Reply-To: <20230531185442.5hvjrknlmecbcm32@pengutronix.de>
On 31.05.23 20:54, Marco Felsch wrote:
> On 23-05-31, Ahmad Fatoum wrote:
>> dos_partition_type == 0 can mean that either a partition is not
>> a MBR partition or that it indeed has a partition type of 0x00.
>>
>> In preparation for using that field in a union, explicitly check if we
>> have a MBR partition.
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>> common/blspec.c | 2 +-
>> fs/fs.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/common/blspec.c b/common/blspec.c
>> index e95a8dba8d76..8c7970da8915 100644
>> --- a/common/blspec.c
>> +++ b/common/blspec.c
>> @@ -729,7 +729,7 @@ int blspec_scan_device(struct bootentries *bootentries, struct device *dev)
>> * partition with the MBR type id of 0xEA already exists it
>> * should be used as $BOOT
>> */
>> - if (cdev->dos_partition_type == 0xea) {
>> + if (cdev_is_mbr_partitioned(cdev->master) && cdev->dos_partition_type == 0xea) {
>
> Since you already various helpers to drop priv direct access, what
> about:
>
> if (cdev_dos_partition_type(cdev) == 0xea)
>
> Within the helper you can check for the cdev_is_mbr_partitioned().
We only have a single call site and there'll be a separate series that adds:
if (cdev_is_gpt_partitioned(cdev->master) && guid_equal(&partcdev->typeuuid, blspec_xbootldr_guid))
/* use that */;
after this line. So I'd rather leave it as is.
Thanks,
Ahmad
>
> ?
>
> Regards,
> Marco
>
>> ret = blspec_scan_cdev(bootentries, cdev);
>> if (ret == 0)
>> ret = -ENOENT;
>> diff --git a/fs/fs.c b/fs/fs.c
>> index 2d2d327c5fbc..9a92e6e251e5 100644
>> --- a/fs/fs.c
>> +++ b/fs/fs.c
>> @@ -108,7 +108,7 @@ void cdev_print(const struct cdev *cdev)
>>
>> if (cdev->filetype)
>> nbytes += printf("Filetype: %s\t", file_type_to_string(cdev->filetype));
>> - if (cdev->dos_partition_type)
>> + if (cdev_is_mbr_partitioned(cdev->master))
>> nbytes += printf("DOS parttype: 0x%02x\t", cdev->dos_partition_type);
>> if (*cdev->partuuid || *cdev->diskuuid)
>> nbytes += printf("%sUUID: %s", cdev_is_partition(cdev) ? "PART" : "DISK",
>> --
>> 2.39.2
>>
>>
>>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2023-06-01 5:32 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 14:59 [PATCH 00/18] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 01/18] common: partitions: decouple from EFI GUID definition Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 02/18] efi: define efi_guid_t as 32-bit aligned guid_t Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 03/18] cdev: fix for_each_cdev macro Ahmad Fatoum
2023-05-31 15:37 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 04/18] of: partition: support of_partition_ensure_probed on parent device Ahmad Fatoum
2023-05-31 16:30 ` Marco Felsch
2023-06-01 4:48 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 05/18] of: of_path: always call of_partition_ensure_probed before resolving Ahmad Fatoum
2023-05-31 16:34 ` Marco Felsch
2023-06-01 7:00 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 06/18] driver: add new cdev_is_partition helper Ahmad Fatoum
2023-05-31 16:36 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 07/18] commands: stat: remove code duplication for type info Ahmad Fatoum
2023-05-31 16:44 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 08/18] cdev: use more descriptive struct cdev::diskuuid/partuuid Ahmad Fatoum
2023-05-31 16:56 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 09/18] cdev: record whether partition is parsed from OF Ahmad Fatoum
2023-05-31 17:04 ` Marco Felsch
2023-06-06 19:31 ` Ahmad Fatoum
2023-06-01 8:03 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 10/18] cdev: have devfs_add_partition return existing identical partition, not NULL Ahmad Fatoum
2023-05-31 17:23 ` Marco Felsch
2023-06-01 4:56 ` Ahmad Fatoum
2023-06-01 7:32 ` Sascha Hauer
2023-06-01 8:26 ` Marco Felsch
2023-06-01 7:36 ` Sascha Hauer
2023-06-07 8:06 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 11/18] block: parse partition table on block device registration Ahmad Fatoum
2023-05-31 17:25 ` Marco Felsch
2023-06-01 7:42 ` Sascha Hauer
2023-06-01 8:33 ` Marco Felsch
2023-06-06 19:30 ` Ahmad Fatoum
2023-06-01 8:24 ` Ulrich Ölmann
2023-06-01 8:31 ` Ahmad Fatoum
2023-06-01 10:33 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 12/18] common: partitions: record whether disk is GPT or MBR partitioned Ahmad Fatoum
2023-05-31 17:33 ` Marco Felsch
2023-06-01 5:08 ` Ahmad Fatoum
2023-06-01 5:58 ` Ahmad Fatoum
2023-06-01 8:19 ` Marco Felsch
2023-06-01 10:40 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 13/18] block: add cdev_is_block_(device,partition,disk) helpers Ahmad Fatoum
2023-05-31 17:35 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 14/18] of: export new of_cdev_find helper Ahmad Fatoum
2023-05-31 17:41 ` Marco Felsch
2023-06-01 8:41 ` Ulrich Ölmann
2023-05-31 14:59 ` [PATCH 15/18] state: factor device path lookup into helper function Ahmad Fatoum
2023-05-31 17:54 ` Marco Felsch
2023-06-01 5:14 ` Ahmad Fatoum
2023-05-31 14:59 ` [PATCH 16/18] cdev: use cdev::dos_partition_type only if cdev_is_mbr_partitioned Ahmad Fatoum
2023-05-31 18:54 ` Marco Felsch
2023-06-01 5:30 ` Ahmad Fatoum [this message]
2023-05-31 14:59 ` [PATCH 17/18] common: partitions: efi: record type UUID in cdev Ahmad Fatoum
[not found] ` <20230531193130.fgmvxm27dh3gbvhh@pengutronix.de>
2023-06-06 19:28 ` Ahmad Fatoum
2023-06-07 8:55 ` Marco Felsch
2023-05-31 14:59 ` [PATCH 18/18] state: allow lookup of barebox state partition by Type GUID Ahmad Fatoum
2023-05-31 20:01 ` Marco Felsch
2023-06-01 5:49 ` Ahmad Fatoum
2023-06-01 8:11 ` Marco Felsch
2023-06-01 10:44 ` Ahmad Fatoum
2023-06-01 8:05 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0ee97e12-50a5-2e28-69fd-3a42d2ab9868@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=m.felsch@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox