* [PATCH] nfs4: The difference of 2 pointers is size_t
@ 2010-10-28 18:06 Geert Uytterhoeven
[not found] ` <alpine.DEB.2.00.1010282004390.31018-97SZ98TBZzA1xEWliksxXw@public.gmane.org>
2010-10-28 18:25 ` Andrew Morton
0 siblings, 2 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2010-10-28 18:06 UTC (permalink / raw)
To: Trond Myklebust, Benny Halevy, Andrew Morton
Cc: linux-nfs, Linux Kernel Development
On m68k, which is 32-bit:
fs/nfs/nfs4proc.c: In function ‘nfs41_sequence_done’:
fs/nfs/nfs4proc.c:432: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘int’
fs/nfs/nfs4proc.c: In function ‘nfs4_setup_sequence’:
fs/nfs/nfs4proc.c:576: warning: format ‘%ld’ expects type ‘long int’, but argument 5 has type ‘int’
On 32-bit, size_t is int; on 64-bit, size_t is long.
Introduced by commit dfb4f309830359352539919f23accc59a20a3758 ("NFSv4.1: keep
seq_res.sr_slot as pointer rather than an index")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
fs/nfs/nfs4proc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 32c8758..80229dc 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
* returned NFS4ERR_DELAY as per Section 2.10.6.2
* of RFC5661.
*/
- dprintk("%s: slot=%ld seq=%d: Operation in progress\n",
+ dprintk("%s: slot=%zd seq=%d: Operation in progress\n",
__func__,
res->sr_slot - res->sr_session->fc_slot_table.slots,
res->sr_slot->seq_nr);
@@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *server,
goto out;
}
- dprintk("--> %s clp %p session %p sr_slot %ld\n",
+ dprintk("--> %s clp %p session %p sr_slot %zd\n",
__func__, session->clp, session, res->sr_slot ?
res->sr_slot - session->fc_slot_table.slots : -1);
--
1.7.0.4
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply related [flat|nested] 5+ messages in thread[parent not found: <alpine.DEB.2.00.1010282004390.31018-97SZ98TBZzA1xEWliksxXw@public.gmane.org>]
* Re: [PATCH] nfs4: The difference of 2 pointers is size_t
[not found] ` <alpine.DEB.2.00.1010282004390.31018-97SZ98TBZzA1xEWliksxXw@public.gmane.org>
@ 2010-10-28 18:17 ` Trond Myklebust
0 siblings, 0 replies; 5+ messages in thread
From: Trond Myklebust @ 2010-10-28 18:17 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Benny Halevy, Andrew Morton, linux-nfs, Linux Kernel Development
On Thu, 2010-10-28 at 20:06 +0200, Geert Uytterhoeven wrote:
> On m68k, which is 32-bit:
>=20
> fs/nfs/nfs4proc.c: In function =E2=80=98nfs41_sequence_done=E2=80=99:
> fs/nfs/nfs4proc.c:432: warning: format =E2=80=98%ld=E2=80=99 expects =
type =E2=80=98long int=E2=80=99, but argument 3 has type =E2=80=98int=E2=
=80=99
> fs/nfs/nfs4proc.c: In function =E2=80=98nfs4_setup_sequence=E2=80=99:
> fs/nfs/nfs4proc.c:576: warning: format =E2=80=98%ld=E2=80=99 expects =
type =E2=80=98long int=E2=80=99, but argument 5 has type =E2=80=98int=E2=
=80=99
>=20
> On 32-bit, size_t is int; on 64-bit, size_t is long.
>=20
> Introduced by commit dfb4f309830359352539919f23accc59a20a3758 ("NFSv4=
=2E1: keep
> seq_res.sr_slot as pointer rather than an index")
>=20
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> fs/nfs/nfs4proc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 32c8758..80229dc 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *t=
ask, struct nfs4_sequence_res *
> * returned NFS4ERR_DELAY as per Section 2.10.6.2
> * of RFC5661.
> */
> - dprintk("%s: slot=3D%ld seq=3D%d: Operation in progress\n",
> + dprintk("%s: slot=3D%zd seq=3D%d: Operation in progress\n",
> __func__,
> res->sr_slot - res->sr_session->fc_slot_table.slots,
> res->sr_slot->seq_nr);
> @@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *=
server,
> goto out;
> }
> =20
> - dprintk("--> %s clp %p session %p sr_slot %ld\n",
> + dprintk("--> %s clp %p session %p sr_slot %zd\n",
> __func__, session->clp, session, res->sr_slot ?
> res->sr_slot - session->fc_slot_table.slots : -1);
> =20
Thanks! Applied.
Trond
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nfs4: The difference of 2 pointers is size_t
2010-10-28 18:06 [PATCH] nfs4: The difference of 2 pointers is size_t Geert Uytterhoeven
[not found] ` <alpine.DEB.2.00.1010282004390.31018-97SZ98TBZzA1xEWliksxXw@public.gmane.org>
@ 2010-10-28 18:25 ` Andrew Morton
2010-10-28 18:38 ` Geert Uytterhoeven
1 sibling, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2010-10-28 18:25 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Trond Myklebust, Benny Halevy, linux-nfs,
Linux Kernel Development
On Thu, 28 Oct 2010 20:06:19 +0200 (CEST)
Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On m68k, which is 32-bit:
>
> fs/nfs/nfs4proc.c: In function ___nfs41_sequence_done___:
> fs/nfs/nfs4proc.c:432: warning: format ___%ld___ expects type ___long int___, but argument 3 has type ___int___
> fs/nfs/nfs4proc.c: In function ___nfs4_setup_sequence___:
> fs/nfs/nfs4proc.c:576: warning: format ___%ld___ expects type ___long int___, but argument 5 has type ___int___
>
> On 32-bit, size_t is int; on 64-bit, size_t is long.
>
> Introduced by commit dfb4f309830359352539919f23accc59a20a3758 ("NFSv4.1: keep
> seq_res.sr_slot as pointer rather than an index")
>
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
> fs/nfs/nfs4proc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 32c8758..80229dc 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
> * returned NFS4ERR_DELAY as per Section 2.10.6.2
> * of RFC5661.
> */
> - dprintk("%s: slot=%ld seq=%d: Operation in progress\n",
> + dprintk("%s: slot=%zd seq=%d: Operation in progress\n",
> __func__,
> res->sr_slot - res->sr_session->fc_slot_table.slots,
> res->sr_slot->seq_nr);
> @@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *server,
> goto out;
> }
>
> - dprintk("--> %s clp %p session %p sr_slot %ld\n",
> + dprintk("--> %s clp %p session %p sr_slot %zd\n",
> __func__, session->clp, session, res->sr_slot ?
> res->sr_slot - session->fc_slot_table.slots : -1);
>
I think it should formally be %t, for a ptrdiff_t.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nfs4: The difference of 2 pointers is size_t
2010-10-28 18:25 ` Andrew Morton
@ 2010-10-28 18:38 ` Geert Uytterhoeven
2010-10-28 19:52 ` Trond Myklebust
0 siblings, 1 reply; 5+ messages in thread
From: Geert Uytterhoeven @ 2010-10-28 18:38 UTC (permalink / raw)
To: Andrew Morton
Cc: Trond Myklebust, Benny Halevy, linux-nfs,
Linux Kernel Development
On Thu, Oct 28, 2010 at 20:25, Andrew Morton <akpm@linux-foundation.org> wrote:
> On Thu, 28 Oct 2010 20:06:19 +0200 (CEST)
> Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
>> On m68k, which is 32-bit:
>>
>> fs/nfs/nfs4proc.c: In function ___nfs41_sequence_done___:
>> fs/nfs/nfs4proc.c:432: warning: format ___%ld___ expects type ___long int___, but argument 3 has type ___int___
>> fs/nfs/nfs4proc.c: In function ___nfs4_setup_sequence___:
>> fs/nfs/nfs4proc.c:576: warning: format ___%ld___ expects type ___long int___, but argument 5 has type ___int___
>>
>> On 32-bit, size_t is int; on 64-bit, size_t is long.
>>
>> Introduced by commit dfb4f309830359352539919f23accc59a20a3758 ("NFSv4.1: keep
>> seq_res.sr_slot as pointer rather than an index")
>>
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> ---
>> fs/nfs/nfs4proc.c | 4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
>> index 32c8758..80229dc 100644
>> --- a/fs/nfs/nfs4proc.c
>> +++ b/fs/nfs/nfs4proc.c
>> @@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
>> * returned NFS4ERR_DELAY as per Section 2.10.6.2
>> * of RFC5661.
>> */
>> - dprintk("%s: slot=%ld seq=%d: Operation in progress\n",
>> + dprintk("%s: slot=%zd seq=%d: Operation in progress\n",
>> __func__,
>> res->sr_slot - res->sr_session->fc_slot_table.slots,
>> res->sr_slot->seq_nr);
>> @@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *server,
>> goto out;
>> }
>>
>> - dprintk("--> %s clp %p session %p sr_slot %ld\n",
>> + dprintk("--> %s clp %p session %p sr_slot %zd\n",
>> __func__, session->clp, session, res->sr_slot ?
>> res->sr_slot - session->fc_slot_table.slots : -1);
>>
>
> I think it should formally be %t, for a ptrdiff_t.
You're correct.
I didn't know we "did" %t. I almost have enough fingers and toes to
count its users ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] nfs4: The difference of 2 pointers is size_t
2010-10-28 18:38 ` Geert Uytterhoeven
@ 2010-10-28 19:52 ` Trond Myklebust
0 siblings, 0 replies; 5+ messages in thread
From: Trond Myklebust @ 2010-10-28 19:52 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Andrew Morton, Benny Halevy, linux-nfs, Linux Kernel Development
On Thu, 2010-10-28 at 20:38 +0200, Geert Uytterhoeven wrote:
> On Thu, Oct 28, 2010 at 20:25, Andrew Morton <akpm@linux-foundation.org> wrote:
> > On Thu, 28 Oct 2010 20:06:19 +0200 (CEST)
> > Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> >> On m68k, which is 32-bit:
> >>
> >> fs/nfs/nfs4proc.c: In function ___nfs41_sequence_done___:
> >> fs/nfs/nfs4proc.c:432: warning: format ___%ld___ expects type ___long int___, but argument 3 has type ___int___
> >> fs/nfs/nfs4proc.c: In function ___nfs4_setup_sequence___:
> >> fs/nfs/nfs4proc.c:576: warning: format ___%ld___ expects type ___long int___, but argument 5 has type ___int___
> >>
> >> On 32-bit, size_t is int; on 64-bit, size_t is long.
> >>
> >> Introduced by commit dfb4f309830359352539919f23accc59a20a3758 ("NFSv4.1: keep
> >> seq_res.sr_slot as pointer rather than an index")
> >>
> >> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >> ---
> >> fs/nfs/nfs4proc.c | 4 ++--
> >> 1 files changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> >> index 32c8758..80229dc 100644
> >> --- a/fs/nfs/nfs4proc.c
> >> +++ b/fs/nfs/nfs4proc.c
> >> @@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
> >> * returned NFS4ERR_DELAY as per Section 2.10.6.2
> >> * of RFC5661.
> >> */
> >> - dprintk("%s: slot=%ld seq=%d: Operation in progress\n",
> >> + dprintk("%s: slot=%zd seq=%d: Operation in progress\n",
> >> __func__,
> >> res->sr_slot - res->sr_session->fc_slot_table.slots,
> >> res->sr_slot->seq_nr);
> >> @@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *server,
> >> goto out;
> >> }
> >>
> >> - dprintk("--> %s clp %p session %p sr_slot %ld\n",
> >> + dprintk("--> %s clp %p session %p sr_slot %zd\n",
> >> __func__, session->clp, session, res->sr_slot ?
> >> res->sr_slot - session->fc_slot_table.slots : -1);
> >>
> >
> > I think it should formally be %t, for a ptrdiff_t.
>
> You're correct.
>
> I didn't know we "did" %t. I almost have enough fingers and toes to
> count its users ;-)
>
> Gr{oetje,eeting}s,
>
> Geert
I did a s/size_t/ptrdiff_t/, s/%z/%t/ to the above and committed the
result with no other changes.
Cheers
Trond
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-10-28 19:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-28 18:06 [PATCH] nfs4: The difference of 2 pointers is size_t Geert Uytterhoeven
[not found] ` <alpine.DEB.2.00.1010282004390.31018-97SZ98TBZzA1xEWliksxXw@public.gmane.org>
2010-10-28 18:17 ` Trond Myklebust
2010-10-28 18:25 ` Andrew Morton
2010-10-28 18:38 ` Geert Uytterhoeven
2010-10-28 19:52 ` Trond Myklebust
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).