diff --git a/sys/rump/include/rump/rump_namei.h b/sys/rump/include/rump/rump_namei.h index 28b087779b7f..2b033197e4e2 100644 --- a/sys/rump/include/rump/rump_namei.h +++ b/sys/rump/include/rump/rump_namei.h @@ -1,11 +1,11 @@ -/* $NetBSD: rump_namei.h,v 1.18 2012/10/13 17:47:11 dholland Exp $ */ +/* $NetBSD: rump_namei.h,v 1.19 2012/11/05 17:24:39 dholland Exp $ */ /* * WARNING: GENERATED FILE. DO NOT EDIT * (edit namei.src and run make namei in src/sys/sys) * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp - * from: NetBSD: namei.src,v 1.27 2012/10/13 17:46:50 dholland Exp + * from: NetBSD: namei.src,v 1.28 2012/11/05 17:24:09 dholland Exp */ #ifndef _RUMP_RUMP_NAMEI_H_ diff --git a/sys/sys/namei.h b/sys/sys/namei.h index 87eea1d569c7..3f34ade0dd98 100644 --- a/sys/sys/namei.h +++ b/sys/sys/namei.h @@ -1,11 +1,11 @@ -/* $NetBSD: namei.h,v 1.82 2012/10/13 17:47:11 dholland Exp $ */ +/* $NetBSD: namei.h,v 1.83 2012/11/05 17:24:39 dholland Exp $ */ /* * WARNING: GENERATED FILE. DO NOT EDIT * (edit namei.src and run make namei in src/sys/sys) * by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp - * from: NetBSD: namei.src,v 1.27 2012/10/13 17:46:50 dholland Exp + * from: NetBSD: namei.src,v 1.28 2012/11/05 17:24:09 dholland Exp */ /* @@ -127,7 +127,6 @@ struct nameidata { */ const char *cn_nameptr; /* pointer to looked up name */ size_t cn_namelen; /* length of looked up comp */ - u_long cn_hash; /* hash val of looked up name */ size_t cn_consume; /* chars to consume in lookup */ } ni_cnd; }; @@ -272,9 +271,10 @@ void cache_purge1(struct vnode *, const struct componentname *, int); #define PURGE_PARENTS 1 #define PURGE_CHILDREN 2 #define cache_purge(vp) cache_purge1((vp), NULL, PURGE_PARENTS|PURGE_CHILDREN) -int cache_lookup(struct vnode *, struct vnode **, struct componentname *); -int cache_lookup_raw(struct vnode *, struct vnode **, - struct componentname *); +int cache_lookup(struct vnode *, const struct componentname *, + int *, struct vnode **); +int cache_lookup_raw(struct vnode *, const struct componentname *, + int *, struct vnode **); int cache_revlookup(struct vnode *, struct vnode **, char **, char *); void cache_enter(struct vnode *, struct vnode *, struct componentname *); void nchinit(void);