lkml.org 
[lkml]   [2010]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] nfs4: The difference of 2 pointers is size_t
From
Date
On Thu, 2010-10-28 at 20:06 +0200, Geert Uytterhoeven 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);
>

Thanks! Applied.

Trond
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2010-10-28 20:21    [W:0.250 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site