2011-03-05 09:27:56

by Jovi Zhang

[permalink] [raw]
Subject: [PATCH] nfs: fix compilation warning

From: Jovi Zhang <[email protected]>

this commit fix compilation warning as following:
linux-2.6/fs/nfs/nfs4proc.c:3265: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Jovi Zhang <[email protected]>
---
fs/nfs/nfs4proc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 1ff76ac..c7eb4ee 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3262,7 +3262,7 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
spages = pages;

do {
- len = min(PAGE_CACHE_SIZE, buflen);
+ len = min((size_t)PAGE_CACHE_SIZE, buflen);
newpage = alloc_page(GFP_KERNEL);

if (newpage == NULL)
--
1.7.2.3


2011-03-11 17:30:25

by Geert Uytterhoeven

[permalink] [raw]
Subject: Re: [PATCH] nfs: fix compilation warning

On Thu, Mar 3, 2011 at 00:19, <[email protected]> wrote:
> From: Jovi Zhang <[email protected]>
>
> this commit fix compilation warning as following:
> linux-2.6/fs/nfs/nfs4proc.c:3265: warning: comparison of distinct pointer types lacks a cast

And as the offender is on track for 2.6.37.4-stable, it needs to be
applied there, too.

> Signed-off-by: Jovi Zhang <[email protected]>
> ---
>  fs/nfs/nfs4proc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 1ff76ac..c7eb4ee 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -3262,7 +3262,7 @@ static int buf_to_pages_noslab(const void *buf, size_t buflen,
>        spages = pages;
>
>        do {
> -               len = min(PAGE_CACHE_SIZE, buflen);
> +               len = min((size_t)PAGE_CACHE_SIZE, buflen);

Alternatively, we could use

len = min_t(size_t, PAGE_CACHE_SIZE, buflen);

which may be somewhat cleaner, as it doesn't add an explicit cast.

>                newpage = alloc_page(GFP_KERNEL);
>
>                if (newpage == NULL)

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds