Clean up. Signed-off-by: Chuck Lever <chuck.lever@xxxxxxxxxx> --- fs/nfsd/nfs4xdr.c | 9 ++++----- fs/nfsd/xdr4.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 4e9f0b5..165f6f4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -244,7 +244,7 @@ static __be32 nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr, struct nfs4_acl **acl) { - int expected_len, len = 0; + u32 expected_len, len = 0; u32 dummy32; char *buf; int host_err; @@ -1125,8 +1125,7 @@ nfsd4_decode_verify(struct nfsd4_compoundargs *argp, struct nfsd4_verify *verify static __be32 nfsd4_decode_write(struct nfsd4_compoundargs *argp, struct nfsd4_write *write) { - int avail; - int len; + u32 avail, len; DECODE_HEAD; status = nfsd4_decode_stateid(argp, &write->wr_stateid); @@ -1193,7 +1192,7 @@ static __be32 nfsd4_decode_exchange_id(struct nfsd4_compoundargs *argp, struct nfsd4_exchange_id *exid) { - int dummy, tmp; + u32 dummy, tmp; DECODE_HEAD; READ_BUF(NFS4_VERIFIER_SIZE); @@ -3022,7 +3021,7 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd static __be32 nfsd4_encode_readdir(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_readdir *readdir) { - int maxcount; + unsigned int maxcount; loff_t offset; __be32 *page, *savep, *tailbase; __be32 *p; diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index 0889bfb..e2ebd9b 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -482,7 +482,7 @@ struct nfsd4_compoundargs { __be32 * p; __be32 * end; struct page ** pagelist; - int pagelen; + unsigned int pagelen; __be32 tmp[8]; __be32 * tmpp; struct tmpbuf { -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html