diff options
author | Bernd Schubert <bernd.schubert@itwm.fraunhofer.de> | 2011-08-08 11:38:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 12:35:54 -0500 |
commit | 6176ebe5391aa20700f9348fa7f7aca1a559e78f (patch) | |
tree | 9e50f1cb6d736fbed2e3ec5ac4fd2a548f96addd | |
parent | 60eb9e7d1a8aeec2d4371ec445e7fd4425d05017 (diff) |
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 3a6dbd70b34..f7799d370ab 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c | |||
@@ -682,7 +682,7 @@ nfsd4_readdir(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, | |||
682 | readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion); | 682 | readdir->rd_bmval[1] &= nfsd_suppattrs1(cstate->minorversion); |
683 | readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion); | 683 | readdir->rd_bmval[2] &= nfsd_suppattrs2(cstate->minorversion); |
684 | 684 | ||
685 | if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) || | 685 | if ((cookie == 1) || (cookie == 2) || |
686 | (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE))) | 686 | (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE))) |
687 | return nfserr_bad_cookie; | 687 | return nfserr_bad_cookie; |
688 | 688 | ||