From 3337b6ac3c298414c387daccb52ae4747d3f1080 Mon Sep 17 00:00:00 2001 From: cgd Date: Sun, 10 Apr 1994 06:45:56 +0000 Subject: [PATCH] patchkit date deletions! --- sys/nfs/nfs_serv.c | 15 ++++++++------- sys/nfs/nfs_socket.c | 14 ++++++-------- sys/nfs/nfsv2.h | 4 ++-- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 0324b92697bb..e4afb98a60bd 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)nfs_serv.c 7.40 (Berkeley) 5/15/91 - * $Id: nfs_serv.c,v 1.12 1994/03/12 01:31:32 cgd Exp $ + * $Id: nfs_serv.c,v 1.13 1994/04/10 06:45:56 cgd Exp $ */ /* @@ -600,7 +600,7 @@ nfsrv_write(mrep, md, dpos, cred, xid, mrq, repstat, p) /* * nfs create service - * if it already exists, just set length * 28 Aug 92* + * if it already exists, just set length * do NOT truncate unconditionally ! */ nfsrv_create(mrep, md, dpos, cred, xid, mrq, repstat, p) @@ -639,7 +639,7 @@ nfsrv_create(mrep, md, dpos, cred, xid, mrq, repstat, p) VATTR_NULL(vap); nfsm_disect(tl, u_long *, NFSX_SATTR); /* - * If it doesn't exist, create it * 28 Aug 92* + * If it doesn't exist, create it * otherwise just set length from attributes * should I set the mode too ?? */ @@ -705,8 +705,9 @@ nfsrv_create(mrep, md, dpos, cred, xid, mrq, repstat, p) else vput(nd.ni_dvp); VOP_ABORTOP(&nd); - vap->va_size = fxdr_unsigned(long, *(tl+3)); /* 28 Aug 92*/ -/* 08 Sep 92*/ if (vap->va_size != -1 && (error = VOP_SETATTR(vp, vap, cred, p))) { + vap->va_size = fxdr_unsigned(long, *(tl+3)); + if (vap->va_size != -1 && + (error = VOP_SETATTR(vp, vap, cred, p))) { vput(vp); nfsm_reply(0); } @@ -1493,10 +1494,10 @@ nfsrv_noop(mrep, md, dpos, cred, xid, mrq, repstat, p) struct proc *p; { caddr_t bpos; - int error; /* 08 Sep 92*/ + int error; struct mbuf *mb, *mreq; - if (*repstat) /* 08 Sep 92*/ + if (*repstat) error = *repstat; else error = EPROCUNAVAIL; diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 7bc05197bd5c..aacd0b4aa4ac 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)nfs_socket.c 7.23 (Berkeley) 4/20/91 - * $Id: nfs_socket.c,v 1.10 1993/12/22 04:13:50 cgd Exp $ + * $Id: nfs_socket.c,v 1.11 1994/04/10 06:45:59 cgd Exp $ */ /* @@ -137,23 +137,21 @@ nfs_connect(nmp) register struct nfsmount *nmp; { register struct socket *so; - struct sockaddr *saddr; /* 08 Sep 92*/ + struct sockaddr *saddr; int s, error, bufsize; struct mbuf *m; - struct sockaddr_in *sin; /* 08 Sep 92*/ - u_short tport; /* 08 Sep 92*/ + struct sockaddr_in *sin; + u_short tport; nmp->nm_so = (struct socket *)0; - saddr = mtod(nmp->nm_nam, struct sockaddr *); /* 08 Sep 92*/ - if (error = socreate(saddr->sa_family, /* 08 Sep 92*/ + saddr = mtod(nmp->nm_nam, struct sockaddr *); + if (error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, nmp->nm_soproto)) goto bad; so = nmp->nm_so; nmp->nm_soflags = so->so_proto->pr_flags; /* - * 08 Sep 92 - * * Some servers require that the client port be a reserved port number. */ if (saddr->sa_family == AF_INET) { diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h index 67606dbb541d..0f046a6c03e3 100644 --- a/sys/nfs/nfsv2.h +++ b/sys/nfs/nfsv2.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)nfsv2.h 7.8 (Berkeley) 6/28/90 - * $Id: nfsv2.h,v 1.6 1994/03/10 16:56:29 ws Exp $ + * $Id: nfsv2.h,v 1.7 1994/04/10 06:46:00 cgd Exp $ */ #ifndef _NFS_NFSV2_H_ @@ -95,7 +95,7 @@ #define NFSPROC_GETATTR 1 #define NFSPROC_SETATTR 2 #define NFSPROC_ROOT 3 /* Obsolete */ -#define NFSPROC_NOOP 3 /* Fake for err returns XXX 08 Sep 92*/ +#define NFSPROC_NOOP 3 /* Fake for err returns XXX */ #define NFSPROC_LOOKUP 4 #define NFSPROC_READLINK 5 #define NFSPROC_READ 6