NFSD: Avoid warning message when compile at i686 arch

PATCH New Kinglong Mee 1 participant 1 message Jun 29, 2014 1 message not in the archive

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 53aebf38.2Sl+piCGJ4BiEZLl%[email protected]

Kinglong Mee

author

2014-06-29 11:18 UTC #1 lore raw

PATCH 1/1 NFSD: Avoid warning message when compile at i686 arch

fs/nfsd/nfs4xdr.c: In function 'nfsd4_encode_readv':

Quoted 1 line

Quoted 1 line
fs/nfsd/nfs4xdr.c:3137:148: warning: comparison of distinct pointer types lacks a cast [enabled by default]

thislen = min(len, ((void *)xdr->end - (void *)xdr->p));

Reported-by Fengguang Wu <[email protected]>

Signed-off-by Kinglong Mee <[email protected]>

---
 fs/nfsd/nfs4xdr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

fs/nfsd/nfs4xdr.c +1 -1

index ec198fa..1b61fbe 100644
@@ -3150,7 +3150,7 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp,
 	len = maxcount;
 	v = 0;
 
-	thislen = min(len, ((void *)xdr->end - (void *)xdr->p));
+	thislen = min_t(long, len, ((void *)xdr->end - (void *)xdr->p));
 	p = xdr_reserve_space(xdr, (thislen+3)&~3);
 	WARN_ON_ONCE(!p);
 	resp->rqstp->rq_vec[v].iov_base = p;

Signature · 1 line

1.9.3