diff options
Diffstat (limited to 'sys/nfs')
-rw-r--r-- | sys/nfs/nfs_bio.c | 6 | ||||
-rw-r--r-- | sys/nfs/nfs_common.c | 6 | ||||
-rw-r--r-- | sys/nfs/nfs_common.h | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_nqlease.c | 6 | ||||
-rw-r--r-- | sys/nfs/nfs_serv.c | 16 | ||||
-rw-r--r-- | sys/nfs/nfs_socket.c | 14 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 6 | ||||
-rw-r--r-- | sys/nfs/nfs_syscalls.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_vfsops.c | 10 | ||||
-rw-r--r-- | sys/nfs/nfs_vnops.c | 14 | ||||
-rw-r--r-- | sys/nfs/nfsm_subs.h | 4 |
11 files changed, 45 insertions, 45 deletions
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c index 057ffb6..f929012 100644 --- a/sys/nfs/nfs_bio.c +++ b/sys/nfs/nfs_bio.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_bio.c 8.5 (Berkeley) 1/4/94 - * $Id: nfs_bio.c,v 1.12 1995/04/16 05:05:25 davidg Exp $ + * $Id: nfs_bio.c,v 1.13 1995/05/21 21:39:21 davidg Exp $ */ #include <sys/param.h> @@ -185,7 +185,7 @@ nfs_bioread(vp, uio, ioflag, cred) error = nfs_readdirrpc(vp, uio, cred); break; default: - printf(" NQNFSNONCACHE: type %x unexpected\n", + printf(" NQNFSNONCACHE: type %x unexpected\n", vp->v_type); break; }; @@ -694,7 +694,7 @@ nfs_asyncio(bp, cred) bp->b_wcred = cred; } } - + TAILQ_INSERT_TAIL(&nfs_bufq, bp, b_freelist); nfs_iodwant[i] = (struct proc *)0; wakeup((caddr_t)&nfs_iodwant[i]); diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 3ccc10a..9aeb0d6 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.13 1995/04/21 02:58:49 dyson Exp $ + * $Id: nfs_subs.c,v 1.14 1995/05/29 04:01:09 davidg Exp $ */ /* @@ -137,7 +137,7 @@ nfsm_reqh(vp, procid, hsiz, bposp) MCLGET(mb, M_WAIT); mb->m_len = 0; bpos = mtod(mb, caddr_t); - + /* * For NQNFS, add lease request. */ @@ -723,7 +723,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) } /* * If v_type == VNON it is a new node, so fill in the v_type, - * n_mtime fields. Check to see if it represents a special + * n_mtime fields. Check to see if it represents a special * device, and if so, check for a possible alias. Once the * correct vnode has been obtained, fill in the rest of the * information. diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h index 994c0b6..030a985 100644 --- a/sys/nfs/nfs_common.h +++ b/sys/nfs/nfs_common.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93 - * $Id: nfsm_subs.h,v 1.4 1994/10/02 17:27:05 phk Exp $ + * $Id: nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp $ */ #ifndef _NFS_NFSM_SUBS_H_ @@ -167,7 +167,7 @@ extern struct mbuf *nfsm_reqh(); mb = mreq = nfsm_reqh((v),(a),(s),&bpos) #define nfsm_reqdone m_freem(mrep); \ - nfsmout: + nfsmout: #define nfsm_rndup(a) (((a)+3)&(~0x3)) diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index c204ea6..81571de 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_nqlease.c,v 1.9 1995/01/29 06:37:13 bde Exp $ + * $Id: nfs_nqlease.c,v 1.10 1995/02/15 03:39:58 davidg Exp $ */ /* @@ -821,7 +821,7 @@ nqnfs_getlease(vp, rwflag, cred, p) struct mbuf *mreq, *mrep, *md, *mb, *mb2; int cachable; u_quad_t frev; - + nfsstats.rpccnt[NQNFSPROC_GETLEASE]++; mb = mreq = nfsm_reqh(vp, NQNFSPROC_GETLEASE, NFSX_FH+2*NFSX_UNSIGNED, &bpos); @@ -862,7 +862,7 @@ nqnfs_vacated(vp, cred) struct mbuf *mreq, *mb, *mb2, *mheadend; struct nfsmount *nmp; struct nfsreq myrep; - + nmp = VFSTONFS(vp->v_mount); nfsstats.rpccnt[NQNFSPROC_VACATED]++; nfsm_reqhead(vp, NQNFSPROC_VACATED, NFSX_FH); diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index bd8f0c3..366a076 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.12 1995/03/19 12:04:11 davidg Exp $ + * $Id: nfs_serv.c,v 1.13 1995/05/29 04:01:08 davidg Exp $ */ /* @@ -966,7 +966,7 @@ nfsrv_rename(nfsd, mrep, md, dpos, cred, nam, mrq) fromnd.ni_cnd.cn_cred = cred; fromnd.ni_cnd.cn_nameiop = DELETE; fromnd.ni_cnd.cn_flags = WANTPARENT | SAVESTART; - error = nfs_namei(&fromnd, ffhp, len, nfsd->nd_slp, nam, &md, &dpos, + error = nfs_namei(&fromnd, ffhp, len, nfsd->nd_slp, nam, &md, &dpos, nfsd->nd_procp); if(error) nfsm_reply(0); @@ -1038,7 +1038,7 @@ out: vm_object_deallocate((vm_object_t) fvp->v_vmdata); if (deallocobjto) vm_object_deallocate((vm_object_t) tvp->v_vmdata); - + } else { VOP_ABORTOP(tond.ni_dvp, &tond.ni_cnd); if (tdvp == tvp) @@ -1574,7 +1574,7 @@ again: nfsm_clget; *tl = txdr_unsigned(nlen); bp += NFSX_UNSIGNED; - + /* And loop around copying the name */ xfer = nlen; cp = dp->d_name; @@ -1594,7 +1594,7 @@ again: for (i = 0; i < rem; i++) *bp++ = '\0'; nfsm_clget; - + /* Finish off the record */ *tl = txdr_unsigned(*cookiep); bp += NFSX_UNSIGNED; @@ -1761,7 +1761,7 @@ again: if (dp->d_fileno != 0) { nlen = dp->d_namlen; rem = nfsm_rndup(nlen)-nlen; - + /* * For readdir_and_lookup get the vnode using * the file number. @@ -1827,7 +1827,7 @@ again: nfsm_clget; *tl = txdr_unsigned(nlen); bp += NFSX_UNSIGNED; - + /* And loop around copying the name */ xfer = nlen; cp = dp->d_name; @@ -1847,7 +1847,7 @@ again: for (i = 0; i < rem; i++) *bp++ = '\0'; nfsm_clget; - + /* Finish off the record */ *tl = txdr_unsigned(*cookiep); bp += NFSX_UNSIGNED; diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index ccd187a..20253ef 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_socket.c,v 1.5 1994/10/17 17:47:35 phk Exp $ + * $Id: nfs_socket.c,v 1.6 1995/03/16 18:15:37 bde Exp $ */ /* @@ -226,7 +226,7 @@ nfs_connect(nmp, rep) nmp->nm_so = (struct socket *)0; saddr = mtod(nmp->nm_nam, struct sockaddr *); - error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, + error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, nmp->nm_soproto); if (error) goto bad; @@ -529,7 +529,7 @@ tryagain: } so = rep->r_nmp->nm_so; if (!so) { - error = nfs_reconnect(rep); + error = nfs_reconnect(rep); if (error) { nfs_sndunlock(&rep->r_nmp->nm_flag); return (error); @@ -739,7 +739,7 @@ nfs_reply(myrep) } if (nam) m_freem(nam); - + /* * Get the xid and check that it is an rpc reply */ @@ -1493,7 +1493,7 @@ nfs_realign(m, hsiz) tcp = mtod(m, caddr_t); mnew = m; m2 = m->m_next; - + /* * If possible, only put the first invariant part * of the RPC header in the first mbuf. @@ -1501,7 +1501,7 @@ nfs_realign(m, hsiz) mlen = M_TRAILINGSPACE(m); if (olen <= hsiz && mlen > hsiz) mlen = hsiz; - + /* * Loop through the mbuf list consolidating data. */ @@ -1534,7 +1534,7 @@ nfs_realign(m, hsiz) fcp = mtod(m, caddr_t); } } - + /* * Finally, set m_len == 0 for any trailing mbufs that have * been copied out of. diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 3ccc10a..9aeb0d6 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.13 1995/04/21 02:58:49 dyson Exp $ + * $Id: nfs_subs.c,v 1.14 1995/05/29 04:01:09 davidg Exp $ */ /* @@ -137,7 +137,7 @@ nfsm_reqh(vp, procid, hsiz, bposp) MCLGET(mb, M_WAIT); mb->m_len = 0; bpos = mtod(mb, caddr_t); - + /* * For NQNFS, add lease request. */ @@ -723,7 +723,7 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper) } /* * If v_type == VNON it is a new node, so fill in the v_type, - * n_mtime fields. Check to see if it represents a special + * n_mtime fields. Check to see if it represents a special * device, and if so, check for a possible alias. Once the * correct vnode has been obtained, fill in the rest of the * information. diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index 8cdbfe7..f7e159f 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_syscalls.c,v 1.4 1994/10/02 17:27:02 phk Exp $ + * $Id: nfs_syscalls.c,v 1.5 1994/10/17 17:47:38 phk Exp $ */ #include <sys/param.h> @@ -319,7 +319,7 @@ nfssvc_addsock(fp, mynam) siz = NFS_MAXPACKET + sizeof (u_long); else siz = NFS_MAXPACKET; - error = soreserve(so, siz, siz); + error = soreserve(so, siz, siz); if (error) { m_freem(mynam); return (error); diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index 7e3c696..037d0dd 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_vfsops.c,v 1.12 1995/03/16 20:23:46 wollman Exp $ + * $Id: nfs_vfsops.c,v 1.13 1995/05/14 03:00:01 davidg Exp $ */ #include <sys/param.h> @@ -198,7 +198,7 @@ nfs_mountroot() if (time.tv_sec == 0) time.tv_sec = 1; - /* + /* * XXX splnet, so networks will receive... */ splnet(); @@ -230,11 +230,11 @@ nfs_mountroot() */ for (i = strlen(nd->myif.ifra_name) - 1; - nd->myif.ifra_name[i] >= '0' && + nd->myif.ifra_name[i] >= '0' && nd->myif.ifra_name[i] <= '9'; nd->myif.ifra_name[i] ++) { error = ifioctl(so, SIOCAIFADDR, (caddr_t)&nd->myif, p); - if(!error) + if(!error) break; } if (error) @@ -281,7 +281,7 @@ nfs_mountroot() vp->v_flag = 0; VREF(vp); swaponvp(p, vp, NODEV, nd->swap_nblks * 2); - } + } /* * Create the rootfs mount point. diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 1cfe1a0..46484ea 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_vnops.c 8.5 (Berkeley) 2/13/94 - * $Id: nfs_vnops.c,v 1.13 1995/03/16 18:15:41 bde Exp $ + * $Id: nfs_vnops.c,v 1.14 1995/03/23 09:43:40 davidg Exp $ */ /* @@ -252,7 +252,7 @@ nfs_null(vp, cred, procp) caddr_t bpos, dpos; int error = 0; struct mbuf *mreq, *mrep, *md, *mb; - + nfsm_reqhead(vp, NFSPROC_NULL, 0); nfsm_request(vp, NFSPROC_NULL, procp, cred); nfsm_reqdone; @@ -436,7 +436,7 @@ nfs_getattr(ap) caddr_t bpos, dpos; int error = 0; struct mbuf *mreq, *mrep, *md, *mb, *mb2; - + /* * Update local times for special files. */ @@ -497,7 +497,7 @@ nfs_setattr(ap) break; default: if (np->n_flag & NMODIFIED) { - error = nfs_vinvalbuf(vp, + error = nfs_vinvalbuf(vp, vap->va_size ? V_SAVE : 0, ap->a_cred, ap->a_p, 1); if (error) @@ -1666,11 +1666,11 @@ nfs_readdirrpc(vp, uiop, cred) siz = 0; nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); more_dirs = fxdr_unsigned(int, *tl); - + /* Save the position so that we can do nfsm_mtouio() later */ dpos2 = dpos; md2 = md; - + /* loop thru the dir entries, doctoring them to 4bsd form */ #ifdef lint dp = (struct dirent *)0; @@ -1817,7 +1817,7 @@ nfs_readdirlookrpc(vp, uiop, cred) nfsm_request(vp, NQNFSPROC_READDIRLOOK, uiop->uio_procp, cred); nfsm_dissect(tl, u_long *, NFSX_UNSIGNED); more_dirs = fxdr_unsigned(int, *tl); - + /* loop thru the dir entries, doctoring them to 4bsd form */ bigenough = 1; while (more_dirs && bigenough) { diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h index 994c0b6..030a985 100644 --- a/sys/nfs/nfsm_subs.h +++ b/sys/nfs/nfsm_subs.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfsm_subs.h 8.1 (Berkeley) 6/16/93 - * $Id: nfsm_subs.h,v 1.4 1994/10/02 17:27:05 phk Exp $ + * $Id: nfsm_subs.h,v 1.5 1994/10/17 17:47:42 phk Exp $ */ #ifndef _NFS_NFSM_SUBS_H_ @@ -167,7 +167,7 @@ extern struct mbuf *nfsm_reqh(); mb = mreq = nfsm_reqh((v),(a),(s),&bpos) #define nfsm_reqdone m_freem(mrep); \ - nfsmout: + nfsmout: #define nfsm_rndup(a) (((a)+3)&(~0x3)) |