diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-05-19 08:31:24 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2010-05-19 08:31:24 +0000 |
| commit | a0866af4df0a13d49dfc920d45fada2f6db41c84 (patch) | |
| tree | 0f4a6bb1e7e97da01ae92afe7f0b30a83c6c58f1 /sys/nfs | |
| parent | 77f46605b921b22444cdb100b2a89118ddef8bc8 (diff) | |
clean up a few things that where left to rot after bob's vfs cache work.
sync a few comments to reality (or remove them), remove the cn_hash member
from struct componentname, spacing.
ok beck@
Diffstat (limited to 'sys/nfs')
| -rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
| -rw-r--r-- | sys/nfs/nfs_vnops.c | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index fc24ce12bad..eea422228d7 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.107 2009/10/19 22:24:18 jsg Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.108 2010/05/19 08:31:23 thib Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -1200,7 +1200,6 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len, tocp = cnp->cn_pnbuf; md = *mdp; rem = mtod(md, caddr_t) + md->m_len - fromcp; - cnp->cn_hash = 0; for (i = 0; i < len; i++) { while (rem == 0) { md = md->m_next; @@ -1215,7 +1214,6 @@ nfs_namei(struct nameidata *ndp, fhandle_t *fhp, int len, error = EACCES; goto out; } - cnp->cn_hash += (u_char)*fromcp; *tocp++ = *fromcp++; rem--; } diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index 20e38f543bb..e2dde9025f0 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.129 2010/04/12 16:37:38 beck Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.130 2010/05/19 08:31:23 thib Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -2427,9 +2427,6 @@ nfs_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred, IFTODT(VTTOIF(np->n_vattr.va_type)); if (cnp->cn_namelen <= NCHNAMLEN) { ndp->ni_vp = newvp; - cnp->cn_hash = - hash32_str(cnp->cn_nameptr, - HASHINIT); cache_purge(ndp->ni_dvp); nfs_cache_enter(ndp->ni_dvp, ndp->ni_vp, cnp); |