Module Name:    src
Committed By:   ad
Date:           Sun Dec  1 18:32:07 UTC 2019

Modified Files:
        src/sys/rump/include/rump: rump_namei.h
        src/sys/sys: namei.h

Log Message:
Regen.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/rump/include/rump/rump_namei.h
cvs rdiff -u -r1.101 -r1.102 src/sys/sys/namei.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/include/rump/rump_namei.h
diff -u src/sys/rump/include/rump/rump_namei.h:1.35 src/sys/rump/include/rump/rump_namei.h:1.36
--- src/sys/rump/include/rump/rump_namei.h:1.35	Sun Dec  1 13:46:34 2019
+++ src/sys/rump/include/rump/rump_namei.h	Sun Dec  1 18:32:07 2019
@@ -1,11 +1,11 @@
-/*	$NetBSD: rump_namei.h,v 1.35 2019/12/01 13:46:34 ad Exp $	*/
+/*	$NetBSD: rump_namei.h,v 1.36 2019/12/01 18:32:07 ad 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.45 2019/12/01 13:45:42 ad Exp 
+ *   from: NetBSD: namei.src,v 1.46 2019/12/01 18:31:19 ad Exp 
  */
 
 #ifndef _RUMP_RUMP_NAMEI_H_

Index: src/sys/sys/namei.h
diff -u src/sys/sys/namei.h:1.101 src/sys/sys/namei.h:1.102
--- src/sys/sys/namei.h:1.101	Sun Dec  1 13:46:34 2019
+++ src/sys/sys/namei.h	Sun Dec  1 18:32:07 2019
@@ -1,11 +1,11 @@
-/*	$NetBSD: namei.h,v 1.101 2019/12/01 13:46:34 ad Exp $	*/
+/*	$NetBSD: namei.h,v 1.102 2019/12/01 18:32:07 ad 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.45 2019/12/01 13:45:42 ad Exp 
+ *   from: NetBSD: namei.src,v 1.46 2019/12/01 18:31:19 ad Exp 
  */
 
 /*
@@ -211,7 +211,6 @@ struct nameidata {
  *
  *      -       stable after initialization
  *      L       namecache_lock
- *      G       namecache_gc_lock
  *      C       struct nchcpu::cpu_lock
  *      L/C     insert needs L, read needs L or any C,
  *              must hold L and all C after (or during) delete before free
@@ -223,11 +222,11 @@ struct namecache {
 	TAILQ_ENTRY(namecache) nc_lru;	/* L pseudo-lru chain */
 	LIST_ENTRY(namecache) nc_dvlist;/* L dvp's list of cache entries */
 	LIST_ENTRY(namecache) nc_vlist; /* L vp's list of cache entries */
-	SLIST_ENTRY(namecache) nc_gclist;/*G queue for garbage collection */
 	struct	vnode *nc_dvp;		/* N vnode of parent of name */
 	struct	vnode *nc_vp;		/* N vnode the name refers to */
-	kmutex_t *nc_lock;		/* - lock on this entry */
-	volatile int nc_hittime;	/* N last time scored a hit */
+	void	*nc_gcqueue;		/* N queue for garbage collection */
+	kmutex_t nc_lock;		/*   lock on this entry */
+	int	nc_hittime;		/* N last time scored a hit */
 	int	nc_flags;		/* - copy of componentname ISWHITEOUT */
 	u_short	nc_nlen;		/* - length of name */
 	char	nc_name[0];		/* - segment name */

Reply via email to