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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/fs/puffs/puffs_sys.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/puffs/puffs_sys.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.78.2.2
retrieving revision 1.79
diff -u -p -r1.78.2.2 -r1.79
--- src/sys/fs/puffs/puffs_sys.h	2012/10/30 17:22:24	1.78.2.2
+++ src/sys/fs/puffs/puffs_sys.h	2012/04/08 15:04:41	1.79
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_sys.h,v 1.78.2.2 2012/10/30 17:22:24 yamt Exp $	*/
+/*	$NetBSD: puffs_sys.h,v 1.79 2012/04/08 15:04:41 manu Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -92,8 +92,6 @@ extern int puffsdebug; /* puffs_subr.c *
     ((pmp)->pmp_flags & PUFFS_KFLAG_LOOKUP_FULLPNBUF)
 #define PUFFS_USE_FS_TTL(pmp)	\
     ((pmp)->pmp_flags & PUFFS_KFLAG_CACHE_FS_TTL)
-#define PUFFS_USE_DOTDOTCACHE(pmp)	\
-    ((pmp)->pmp_flags & PUFFS_KFLAG_CACHE_DOTDOT)
 
 #define PUFFS_WCACHEINFO(pmp)	0
 
@@ -103,30 +101,23 @@ struct puffs_newcookie {
 	LIST_ENTRY(puffs_newcookie) pnc_entries;
 };
 
-#define PUFFS_SOPREQ_EXPIRE_TIMEOUT 1000
-extern int puffs_sopreq_expire_timeout;
-
 enum puffs_sopreqtype {
 	PUFFS_SOPREQSYS_EXIT,
 	PUFFS_SOPREQ_FLUSH,
 	PUFFS_SOPREQ_UNMOUNT,
-	PUFFS_SOPREQ_EXPIRE,
 };
 
 struct puffs_sopreq {
 	union {
 		struct puffs_req preq;
 		struct puffs_flush pf;
-		puffs_cookie_t ck;
 	} psopr_u;
 
 	enum puffs_sopreqtype psopr_sopreq;
 	TAILQ_ENTRY(puffs_sopreq) psopr_entries;
-	int psopr_at;
 };
 #define psopr_preq psopr_u.preq
 #define psopr_pf psopr_u.pf
-#define psopr_ck psopr_u.ck
 
 TAILQ_HEAD(puffs_wq, puffs_msgpark);
 LIST_HEAD(puffs_node_hashlist, puffs_node);
@@ -177,8 +168,7 @@ struct puffs_mount {
 	kmutex_t			pmp_sopmtx;
 	kcondvar_t			pmp_sopcv;
 	int				pmp_sopthrcount;
-	TAILQ_HEAD(, puffs_sopreq)	pmp_sopfastreqs;
-	TAILQ_HEAD(, puffs_sopreq)	pmp_sopnodereqs;
+	TAILQ_HEAD(, puffs_sopreq)	pmp_sopreqs;
 	bool				pmp_docompat;
 };
 
@@ -188,11 +178,10 @@ struct puffs_mount {
 #define PUFFSTAT_DYING		3 /* Do you want your possessions identified? */
 
 
-#define PNODE_NOREFS	0x001	/* no backend reference			*/
-#define PNODE_DYING	0x002	/* NOREFS + inactive			*/
-#define PNODE_FAF	0x004	/* issue all operations as FAF		*/
-#define PNODE_DOINACT 	0x008	/* if inactive-on-demand, call inactive */
-#define PNODE_SOPEXP	0x100	/* Node reclaim postponed in sop thread	*/
+#define PNODE_NOREFS	0x01	/* no backend reference			*/
+#define PNODE_DYING	0x02	/* NOREFS + inactive			*/
+#define PNODE_FAF	0x04	/* issue all operations as FAF		*/
+#define PNODE_DOINACT	0x08	/* if inactive-on-demand, call inactive */
 
 #define PNODE_METACACHE_ATIME	0x10	/* cache atime metadata */
 #define PNODE_METACACHE_CTIME	0x20	/* cache atime metadata */
@@ -205,7 +194,6 @@ struct puffs_node {
 
 	kmutex_t	pn_mtx;
 	int		pn_refcount;
-	int		pn_nlookup;
 
 	puffs_cookie_t	pn_cookie;	/* userspace pnode cookie	*/
 	struct vnode	*pn_vp;		/* backpointer to vnode		*/
@@ -227,10 +215,8 @@ struct puffs_node {
 	kmutex_t	pn_sizemtx;	/* size modification mutex	*/
 	
 	int		pn_cn_timeout;	/* path cache */
-	int		pn_cn_grace;	/* grace time before reclaim */
 	int		pn_va_timeout;	/* attribute cache */
 	struct vattr *	pn_va_cache;	/* attribute cache */
-	struct vnode *  pn_parent;	/* parent cache */
 
 	LIST_ENTRY(puffs_node) pn_hashent;
 };