Skip to content

Commit 12364a4

Browse files
geertuTrond Myklebust
authored and
Trond Myklebust
committed
nfs4: The difference of 2 pointers is ptrdiff_t
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, ptrdiff_t is int; on 64-bit, ptrdiff_t is long. Introduced by commit dfb4f30 ("NFSv4.1: keep seq_res.sr_slot as pointer rather than an index") Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
1 parent 8f0d97b commit 12364a4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/nfs/nfs4proc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static int nfs41_sequence_done(struct rpc_task *task, struct nfs4_sequence_res *
429429
* returned NFS4ERR_DELAY as per Section 2.10.6.2
430430
* of RFC5661.
431431
*/
432-
dprintk("%s: slot=%ld seq=%d: Operation in progress\n",
432+
dprintk("%s: slot=%td seq=%d: Operation in progress\n",
433433
__func__,
434434
res->sr_slot - res->sr_session->fc_slot_table.slots,
435435
res->sr_slot->seq_nr);
@@ -573,7 +573,7 @@ int nfs4_setup_sequence(const struct nfs_server *server,
573573
goto out;
574574
}
575575

576-
dprintk("--> %s clp %p session %p sr_slot %ld\n",
576+
dprintk("--> %s clp %p session %p sr_slot %td\n",
577577
__func__, session->clp, session, res->sr_slot ?
578578
res->sr_slot - session->fc_slot_table.slots : -1);
579579

0 commit comments

Comments
 (0)