--- src/sys/sys/filedesc.h	2006/05/26 02:26:26	1.19
+++ src/sys/sys/filedesc.h	2006/10/27 04:56:33	1.20
@@ -47,6 +47,9 @@
 #ifndef _SYS_SPINLOCK_H_
 #include <sys/spinlock.h>
 #endif
+#ifndef _SYS_NAMECACHE_H_
+#include <sys/namecache.h>
+#endif
 
 /*
  * This structure is used for the management of descriptors.  It may be
@@ -65,7 +68,6 @@
 
 struct file;
 struct klist;
-struct namecache;
 
 struct fdnode {
 	struct file *fp;
@@ -81,9 +83,9 @@ struct filedesc {
 	struct	vnode *fd_cdir;		/* current directory (phaseout) */
 	struct	vnode *fd_rdir;		/* root directory (phaseout) */
 	struct	vnode *fd_jdir;		/* jail root directory (phaseout) */
-	struct  namecache *fd_ncdir;	/* current directory */
-	struct  namecache *fd_nrdir;	/* root directory */
-	struct  namecache *fd_njdir;	/* jail directory */
+	struct  nchandle fd_ncdir;	/* current directory */
+	struct  nchandle fd_nrdir;	/* root directory */
+	struct  nchandle fd_njdir;	/* jail directory */
 	int	fd_nfiles;		/* number of open files allocated */
 	int	fd_lastfile;		/* high-water mark of fd_files */
 	int	fd_freefile;		/* approx. next free file */