Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Wed, 14 Aug 2002 16:47:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Wed, 14 Aug 2002 16:46:50 -0400 Received: from berzerk.gpcc.itd.umich.edu ([141.211.2.162]:35030 "EHLO berzerk.gpcc.itd.umich.edu") by vger.kernel.org with ESMTP id ; Wed, 14 Aug 2002 16:43:59 -0400 Date: Wed, 14 Aug 2002 16:47:50 -0400 (EDT) From: "Kendrick M. Smith" X-X-Sender: kmsmith@vanguard.gpcc.itd.umich.edu To: linux-kernel@vger.kernel.org, Subject: REPOST patch 23/38: SERVER: change ->rq_vers==3 to ->rq_vers>2 Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1553 Lines: 55 In a few places on the server, I had to change code that looked like: if (rqstp->rq_vers == 3) /* NFSv3 behavior */ else /* NFSv2 behavior */ to: if (rqstp->rq_vers > 2) /* NFSv3 behavior */ else /* NFSv2 behavior */ so that we would get the NFSv3 behavior, not the NFSv2 behavior, in NFSv4. This patch collects all changes of this type. --- old/fs/nfsd/nfsfh.c Sun Aug 11 22:53:12 2002 +++ new/fs/nfsd/nfsfh.c Sun Aug 11 22:53:33 2002 @@ -107,7 +107,7 @@ fh_verify(struct svc_rqst *rqstp, struct int fsid = 0; error = nfserr_stale; - if (rqstp->rq_vers == 3) + if (rqstp->rq_vers > 2) error = nfserr_badhandle; if (fh->fh_version == 1) { @@ -171,7 +171,7 @@ fh_verify(struct svc_rqst *rqstp, struct * Look up the dentry using the NFS file handle. */ error = nfserr_stale; - if (rqstp->rq_vers == 3) + if (rqstp->rq_vers > 2) error = nfserr_badhandle; if (fh->fh_version != 1) { --- old/fs/nfsd/vfs.c Thu Aug 1 16:16:20 2002 +++ new/fs/nfsd/vfs.c Sun Aug 11 22:53:33 2002 @@ -1401,7 +1401,7 @@ nfsd_readdir(struct svc_rqst *rqstp, str eof = !cd.eob; if (cd.offset) { - if (rqstp->rq_vers == 3) + if (rqstp->rq_vers > 2) (void)xdr_encode_hyper(cd.offset, file.f_pos); else *cd.offset = htonl(file.f_pos); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/