diff options
| author | Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> | 2011-08-08 17:38:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-07 12:32:29 -0800 |
| commit | 549115ad71a20ae4d3d87a402e1644b710e6d010 (patch) | |
| tree | cd0a1e5e169a68be7595b068de0d176827e4ae44 | |
| parent | ec9ee3fc9e547d98eb66c260b84525f0a4e46df9 (diff) | |
| download | linux-stable-549115ad71a20ae4d3d87a402e1644b710e6d010.tar.gz linux-stable-549115ad71a20ae4d3d87a402e1644b710e6d010.tar.bz2 linux-stable-549115ad71a20ae4d3d87a402e1644b710e6d010.zip | |
nfsd4: Remove check for a 32-bit cookie in nfsd4_readdir()
commit 832023bffb4b493f230be901f681020caf3ed1f8 upstream.
Fan Yong <yong.fan@whamcloud.com> noticed setting
FMODE_32bithash wouldn't work with nfsd v4, as
nfsd4_readdir() checks for 32 bit cookies. However, according to RFC 3530
cookies have a 64 bit type and cookies are also defined as u64 in
'struct nfsd4_readdir'. So remove the test for >32-bit values.
Signed-off-by: Bernd Schubert <bernd.schubert@itwm.fraunhofer.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | fs/nfsd/nfs4proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 01d83a569ebf..dffc6ff6a05d 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -688,7 +688,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion); readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion); - if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) || + if ((cookie == 1) || (cookie == 2) || (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE))) return nfserr_bad_cookie; |