Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12364a4f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Trond Myklebust
Browse files

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 dfb4f309 ("NFSv4.1: keep
seq_res.sr_slot as pointer rather than an index")

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 8f0d97b4

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -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=%td 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 %td\n",

		__func__, session->clp, session, res->sr_slot ?

			res->sr_slot - session->fc_slot_table.slots : -1);