diff options
| author | Chuck Lever | 2007-11-01 21:57:20 +0100 |
|---|---|---|
| committer | J. Bruce Fields | 2008-02-01 22:42:03 +0100 |
| commit | a628f6675861d979405f751418e924c4ec7d457d (patch) | |
| tree | 09281fd445da7841b890a626004abb012c06debd | |
| parent | NFSD: Use unsigned length argument for decode_pathname (diff) | |
| download | kernel-qcow2-linux-a628f6675861d979405f751418e924c4ec7d457d.tar.gz kernel-qcow2-linux-a628f6675861d979405f751418e924c4ec7d457d.tar.xz kernel-qcow2-linux-a628f6675861d979405f751418e924c4ec7d457d.zip | |
NFSD: Fix mixed sign comparison in nfs3svc_decode_symlinkargs
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Acked-By: NeilBrown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/nfs3xdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index c02b8d69297d..be515c5a8154 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -452,8 +452,7 @@ int nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, struct nfsd3_symlinkargs *args) { - unsigned int len; - int avail; + unsigned int len, avail; char *old, *new; struct kvec *vec; @@ -486,7 +485,8 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, __be32 *p, /* now copy next page if there is one */ if (len && !avail && rqstp->rq_arg.page_len) { avail = rqstp->rq_arg.page_len; - if (avail > PAGE_SIZE) avail = PAGE_SIZE; + if (avail > PAGE_SIZE) + avail = PAGE_SIZE; old = page_address(rqstp->rq_arg.pages[0]); } while (len && avail && *old) { |