On Mon, Aug 08, 2011 at 05:38:08PM +0200, Bernd Schubert wrote: > Fan Yong <yong.fan@xxxxxxxxxxxxx> 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. Wow, thanks, I wonder where that check came from. Looks like it was there since the very first nfsv4 commit. Applying. --b. > > Signed-off-by: Bernd Schubert <bernd.schubert@xxxxxxxxxxxxxxxxxx> > --- > 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 e807776..9bf0a66 100644 > --- a/fs/nfsd/nfs4proc.c > +++ b/fs/nfsd/nfs4proc.c > @@ -691,7 +691,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; > > > -- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
