diff options
| author | phk <phk@FreeBSD.org> | 1997-09-10 19:52:27 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-09-10 19:52:27 +0000 |
| commit | 4d0f72e0e25cb52d81ff2dfec572ad57269f7255 (patch) | |
| tree | 60645a256c28dd6f2dfb473b58187fa055860e05 /sys/nfs/nfs_subs.c | |
| parent | 8e20f7ec0eb58e4adf6aaa2f3a9ca01a9bce42c4 (diff) | |
| download | FreeBSD-src-4d0f72e0e25cb52d81ff2dfec572ad57269f7255.zip FreeBSD-src-4d0f72e0e25cb52d81ff2dfec572ad57269f7255.tar.gz | |
unifdef -U__NetBSD__ -D__FreeBSD__
Diffstat (limited to 'sys/nfs/nfs_subs.c')
| -rw-r--r-- | sys/nfs/nfs_subs.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 69baccb..e7b5340 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.40 1997/07/22 15:35:57 dfr Exp $ + * $Id: nfs_subs.c,v 1.41 1997/08/16 19:15:59 wollman Exp $ */ /* @@ -1170,7 +1170,6 @@ nfs_init(vfsp) nfs_timer(0); -#ifdef __FreeBSD__ /* * Set up lease_check and lease_updatetime so that other parts * of the system can call us, if we are loadable. @@ -1188,7 +1187,6 @@ nfs_init(vfsp) sysent[SYS_getfh].sy_call = getfh; #endif #endif -#endif return (0); } @@ -1455,10 +1453,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, p, kerbflag, pubflag) tocp = cnp->cn_pnbuf; md = *mdp; rem = mtod(md, caddr_t) + md->m_len - fromcp; -#ifdef __FreeBSD__ - /* XXX why is this in FreeBSD but not in NetBSD? */ cnp->cn_hash = 0; -#endif for (i = 0; i < len; i++) { while (rem == 0) { md = md->m_next; @@ -1473,10 +1468,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, retdirp, p, kerbflag, pubflag) error = EACCES; goto out; } -#ifdef __FreeBSD__ - /* XXX why is this in FreeBSD but not in NetBSD? */ cnp->cn_hash += (unsigned char)*fromcp; -#endif *tocp++ = *fromcp++; rem--; } |
