* [PATCH] block: partitions: efi: Typecast sizeof(gpt_header)
@ 2013-02-20 14:52 Fabio Estevam
2013-02-20 16:27 ` Peter Jones
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2013-02-20 14:52 UTC (permalink / raw)
To: akpm
Cc: sfr, linux-kernel, Fabio Estevam, Peter Jones, Matt Fleming,
Jens Axboe
From: Fabio Estevam <fabio.estevam@freescale.com>
Since commit ef25bb0fa6e2 (block/partitions/efi.c: ensure that the GPT header is
at least the size of the structure.) , when building for a 32-bit architecture,
such as ARM, the following build warning is seen:
block/partitions/efi.c:324:3: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat]
Typecast sizeof(gpt_header) to (unsigned long) to avoid such warning on 32-bit
systems.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Peter Jones <pjones@redhat.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
block/partitions/efi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/partitions/efi.c b/block/partitions/efi.c
index a7475e7..62e05cf 100644
--- a/block/partitions/efi.c
+++ b/block/partitions/efi.c
@@ -323,7 +323,7 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
if (le32_to_cpu((*gpt)->header_size) < sizeof(gpt_header)) {
pr_debug("GUID Partition Table Header size is too small: %u < %lu\n",
le32_to_cpu((*gpt)->header_size),
- sizeof(gpt_header));
+ (unsigned long)sizeof(gpt_header));
goto fail;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] block: partitions: efi: Typecast sizeof(gpt_header)
2013-02-20 14:52 [PATCH] block: partitions: efi: Typecast sizeof(gpt_header) Fabio Estevam
@ 2013-02-20 16:27 ` Peter Jones
2013-02-20 20:59 ` Andrew Morton
0 siblings, 1 reply; 3+ messages in thread
From: Peter Jones @ 2013-02-20 16:27 UTC (permalink / raw)
To: Fabio Estevam
Cc: akpm, sfr, linux-kernel, Fabio Estevam, Matt Fleming, Jens Axboe
On Wed, Feb 20, 2013 at 11:52:10AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> Since commit ef25bb0fa6e2 (block/partitions/efi.c: ensure that the GPT header is
> at least the size of the structure.) , when building for a 32-bit architecture,
> such as ARM, the following build warning is seen:
>
> block/partitions/efi.c:324:3: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat]
Hi Fabio,
I sent and updated version of ef25bb0fa6e2 this morning to fix this
issue. Thanks for the patch, though. Andrew, if you'd like you can
just use this instead of replacing my patch with the new one.
Signed-off-by: Peter Jones <pjones@redhat.com>
>
> Typecast sizeof(gpt_header) to (unsigned long) to avoid such warning on 32-bit
> systems.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Peter Jones <pjones@redhat.com>
> Cc: Matt Fleming <matt.fleming@intel.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> block/partitions/efi.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/block/partitions/efi.c b/block/partitions/efi.c
> index a7475e7..62e05cf 100644
> --- a/block/partitions/efi.c
> +++ b/block/partitions/efi.c
> @@ -323,7 +323,7 @@ static int is_gpt_valid(struct parsed_partitions *state, u64 lba,
> if (le32_to_cpu((*gpt)->header_size) < sizeof(gpt_header)) {
> pr_debug("GUID Partition Table Header size is too small: %u < %lu\n",
> le32_to_cpu((*gpt)->header_size),
> - sizeof(gpt_header));
> + (unsigned long)sizeof(gpt_header));
> goto fail;
> }
>
> --
> 1.7.9.5
>
--
Peter
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block: partitions: efi: Typecast sizeof(gpt_header)
2013-02-20 16:27 ` Peter Jones
@ 2013-02-20 20:59 ` Andrew Morton
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Morton @ 2013-02-20 20:59 UTC (permalink / raw)
To: Peter Jones
Cc: Fabio Estevam, sfr, linux-kernel, Fabio Estevam, Matt Fleming,
Jens Axboe
On Wed, 20 Feb 2013 11:27:48 -0500
Peter Jones <pjones@redhat.com> wrote:
> On Wed, Feb 20, 2013 at 11:52:10AM -0300, Fabio Estevam wrote:
> > From: Fabio Estevam <fabio.estevam@freescale.com>
> >
> > Since commit ef25bb0fa6e2 (block/partitions/efi.c: ensure that the GPT header is
> > at least the size of the structure.) , when building for a 32-bit architecture,
> > such as ARM, the following build warning is seen:
> >
> > block/partitions/efi.c:324:3: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat]
>
> Hi Fabio,
>
> I sent and updated version of ef25bb0fa6e2 this morning to fix this
> issue. Thanks for the patch, though. Andrew, if you'd like you can
> just use this instead of replacing my patch with the new one.
You're both wrong ;) Print a size_t with %z:
--- a/block/partitions/efi.c~ensure-that-the-gpt-header-is-at-least-the-size-of-the-structure-fix
+++ a/block/partitions/efi.c
@@ -321,7 +321,7 @@ static int is_gpt_valid(struct parsed_pa
/* Check the GUID Partition Table header size is too small */
if (le32_to_cpu((*gpt)->header_size) < sizeof(gpt_header)) {
- pr_debug("GUID Partition Table Header size is too small: %u < %lu\n",
+ pr_debug("GUID Partition Table Header size is too small: %u < %zu\n",
le32_to_cpu((*gpt)->header_size),
sizeof(gpt_header));
goto fail;
_
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-02-20 20:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-20 14:52 [PATCH] block: partitions: efi: Typecast sizeof(gpt_header) Fabio Estevam
2013-02-20 16:27 ` Peter Jones
2013-02-20 20:59 ` Andrew Morton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox