Garbage collect CODAFS bits which are now completely disconnected from

the tree since few months.

This patch is not targeted for MFC.

22 files changed, 2 insertions, 6161 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 93d50fe..d42b2dc 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130302: CODAFS support removed
+OLD_FILES+=usr/share/man/man4/coda.4.gz
 # 20130302: XFS support removed
 OLD_FILES+=usr/share/man/man5/xfs.5.gz
 # 20130116: removed long unused directories for .1aout section manpages
diff --git a/share/man/man4/coda.4 b/share/man/man4/coda.4
deleted file mode 100644
index e1799ef..0000000
--- a/share/man/man4/coda.4
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 2008 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.Dd January 21, 2008
-.Dt CODA 4
-.Os
-.Sh NAME
-.Nm coda
-.Nd Coda Distributed File System
-.Sh SYNOPSIS
-To compile this driver into the kernel,
-place the following lines in your
-kernel configuration file:
-.Bd -ragged -offset indent
-.Cd "options CODA"
-.Ed
-.Pp
-Alternatively, to load the driver as a
-module at boot time, place the following line in
-.Xr loader.conf 5 :
-.Bd -literal -offset indent
-coda_load="YES"
-.Ed
-.Pp
-To load as a kernel loadable module after boot:
-.Pp
-.Dl "kldload coda"
-.Sh DESCRIPTION
-The
-.Nm
-kernel module allows the experimental, third-party Coda distributed file
-system client to be used with
-.Fx .
-The module allows the userspace Coda client daemon, Venus, to present the
-Coda distributed file system namespace via the local
-.Pa /coda
-file system mountpoint via the
-.Pa /dev/cfs0
-special device.
-.Pp
-To use Coda, the Coda client software package must also be installed; more
-information on Coda may be found in the Coda documentation distributed with
-that package.
-.Sh SEE ALSO
-.Xr loader.conf 5 ,
-.Xr kldload 8
-.Sh HISTORY
-Support for
-.Nm
-first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This manual page was written by
-.An Robert Watson Aq rwatson@FreeBSD.org .
-.Sh BUGS
-The
-Coda distributed file system is considered experimental, and production
-deployment should occur only after careful consideration of the risks of
-deploying experimental software.
diff --git a/sys/fs/coda/README b/sys/fs/coda/README
deleted file mode 100644
index 19de799..0000000
--- a/sys/fs/coda/README
+++ /dev/null
@@ -1,62 +0,0 @@
-$FreeBSD$
-
-                Announcing the Availability of the
-                        Coda Distributed
-                           Filesystem
-                              for
-                         BSD Unix Systems
-
-        Coda is a distributed filesystem like NFS and AFS.  It is
-freely available, like NFS.  But it functions much like AFS in being a
-"stateful" filesystem.  Coda and AFS cache files on your local
-machine to improve performance.  But Coda goes a step further than AFS
-by letting you access the cached files when there is no available
-network, viz. disconnected laptops and network outages.  In Coda, both
-the client and server are outside the kernel which makes them easier
-to experiment with.
-
-To get more information on Coda, I would like to refer people to
-        http://www.coda.cs.cmu.edu
-There is a wealth of documents, papers, and theses there.  There is
-also a good introduction to the Coda File System in
-        http://www.coda.cs.cmu.edu/ljpaper/lj.html
-
-Coda was originally developed as an academic prototype/testbed.  It is
-being polished and rewritten where necessary.  Coda is a work in
-progress and does have bugs.  It is, though, very usable.  Our
-interest is in making Coda available to as many people as possible and
-to have Coda evolve and flourish.
-
-The bulk of the Coda filesystem code supports the Coda client
-program, the Coda server program and the utilities needed by both.
-All these programs are unix programs and can run equally well on any
-Unix platform.  Our main development thrust is improving these
-programs.  There is a small part of Coda that deals with the kernel to
-filesystem interface.  This code is OS specific (but should not be
-platform specific).
-
-Coda is currently available for several OS's and platforms:
-        Freebsd-2.2.5: i386
-        Freebsd-2.2.6: i386
-	Freebsd -current: i386
-        linux 2.0: i386 & sparc
-        linux 2.1: i386 & sparc
-        NetBSD 1.3: i386
-	NetBSD -current: i386
-The relevant sources, binaries, and docs can be found in
-        ftp://ftp.coda.cs.cmu.edu/pub/coda/
-
-We intend to come out with new Coda releases often, not daily.  We
-don't want to slight any OS/platform not mentioned above.  We are just
-limited in our resources as to what we can support internally.  We
-will be happy to integrate OpenBSD support as well as other OS
-support.  Also, adding platform support should be relatively easy and
-we can discuss this.  The only difficulty is that Coda has a light weight
-process package.  It does some manipulations in assembler which would
-have to be redone for a different platform.
-
-There are several mailing lists @coda.cs.cmu.edu that discuss coda:
-coda-announce and linux-coda.  We are going to revise linux-coda to be
-OS neutral, since it is mainly Coda we want to discuss.  We appreciate
-comments, feedback, bug reports, bug fixes, enhancements, etc.
-
diff --git a/sys/fs/coda/TODO b/sys/fs/coda/TODO
deleted file mode 100644
index a0a618a..0000000
--- a/sys/fs/coda/TODO
+++ /dev/null
@@ -1,16 +0,0 @@
-OOPS:
-	FreeBSD does not fsync!!!
-
-Near term:
-	Fix bug in executing/mapping new files.
-	cfs_mount bug: interaction with cfs_inactive no cfs_unsave.
-	vref/vn_lock == vget except no VXWANT which may be on.
-	Review locks: vn_lock/VOP_UNLOCK/lockmgr ...
-
-Medium term:
-	Add missing VFS methods.
-	Do performance profile.
-	Tune hash algorithm used in cfs_subr.
-	Make MPSAFE
-
-$FreeBSD$
diff --git a/sys/fs/coda/cnode.h b/sys/fs/coda/cnode.h
deleted file mode 100644
index 27531a4..0000000
--- a/sys/fs/coda/cnode.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- *
- */
-
-/*-
- * Mach Operating System
- * Copyright (c) 1990 Carnegie-Mellon University
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon University.
- * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
- */
-
-#ifndef	_CNODE_H_
-#define	_CNODE_H_
-
-#include <sys/vnode.h>
-#include <sys/lock.h>
-
-MALLOC_DECLARE(M_CODA);
-
-/*
- * Cnode lookup stuff.
- *
- * NOTE: CODA_CACHESIZE must be a power of 2 for cfshash to work!
- */
-#define	CODA_CACHESIZE	512
-
-#define	CODA_ALLOC(ptr, cast, size) do {				\
-	ptr = (cast)malloc((unsigned long) size, M_CODA, M_WAITOK);	\
-	if (ptr == NULL)						\
-		panic("kernel malloc returns 0 at %s:%d\n", __FILE__,	\
-		    __LINE__);						\
-} while (0)
-
-#define	CODA_FREE(ptr, size)	free((ptr), M_CODA)
-
-/*
- * Used to select debugging statements throughout the cfs code.
- */
-extern int codadebug;
-extern int coda_printf_delay;
-extern int coda_vnop_print_entry;
-extern int coda_psdev_print_entry;
-extern int coda_vfsop_print_entry;
-
-#define	CODADBGMSK(N)		(1 << N)
-
-#define	CODADEBUG(N, STMT) do {						\
-	if (codadebug & CODADBGMSK(N)) {				\
-		STMT							\
-	}								\
-} while (0)
-
-#define	myprintf(args) do {						\
-	if (coda_printf_delay)						\
-		DELAY(coda_printf_delay);				\
-	printf args ;							\
-} while (0)
-
-struct cnode {
-	struct vnode	*c_vnode;
-	u_short		 c_flags;	/* flags (see below) */
-	struct CodaFid	 c_fid;		/* file handle */
-	struct vnode	*c_ovp;		/* open vnode pointer */
-	u_short		 c_ocount;	/* count of openers */
-	u_short		 c_owrite;	/* count of open for write */
-	struct vattr	 c_vattr; 	/* attributes */
-	char		*c_symlink;	/* pointer to symbolic link */
-	u_short		 c_symlen;	/* length of symbolic link */
-	uid_t		 c_cached_uid;	/* cached uid */
-	accmode_t	 c_cached_mode;	/* cached access mode */
-	struct cnode	*c_next;	/* links if on FreeBSD machine */
-};
-#define	VTOC(vp)	((struct cnode *)(vp)->v_data)
-#define	CTOV(cp)	((struct vnode *)((cp)->c_vnode))
-
-/* flags */
-#define	C_VATTR		0x01	/* Validity of vattr in the cnode */
-#define	C_SYMLINK	0x02	/* Validity of symlink pointer in the Code */
-#define	C_ACCCACHE	0x04	/* Validity of access cache */
-#define	C_WANTED	0x08	/* Set if lock wanted */
-#define	C_LOCKED	0x10	/* Set if lock held */
-#define	C_UNMOUNTING	0X20	/* Set if unmounting */
-#define	C_PURGING	0x40	/* Set if purging a fid */
-
-#define	VALID_VATTR(cp)		((cp->c_flags) & C_VATTR)
-#define	VALID_SYMLINK(cp)	((cp->c_flags) & C_SYMLINK)
-#define	VALID_ACCCACHE(cp)	((cp->c_flags) & C_ACCCACHE)
-#define	IS_UNMOUNTING(cp)	((cp)->c_flags & C_UNMOUNTING)
-
-struct vcomm {
-	u_long			vc_seq;
-	struct selinfo		vc_selproc;
-	TAILQ_HEAD(, vmsg)	vc_requests;
-	TAILQ_HEAD(, vmsg)	vc_replies;
-	int			vc_open;
-};
-
-#define	VC_OPEN(vcp)		((vcp)->vc_open == 1)
-#define	MARK_VC_CLOSED(vcp)	(vcp)->vc_open = 0
-#define	MARK_VC_OPEN(vcp)	(vcp)->vc_open = 1
-
-struct coda_clstat {
-	int	ncalls;			/* client requests */
-	int	nbadcalls;		/* upcall failures */
-	int	reqs[CODA_NCALLS];	/* count of each request */
-};
-extern struct coda_clstat coda_clstat;
-
-/*
- * CODA structure to hold mount/filesystem information.
- */
-struct coda_mntinfo {
-	struct vnode	*mi_rootvp;
-	struct mount	*mi_vfsp;
-	struct vcomm	 mi_vcomm;
-	struct cdev	*dev;
-	int		 mi_started;
-	LIST_ENTRY(coda_mntinfo) mi_list;
-};
-struct coda_mntinfo *dev2coda_mntinfo(struct cdev *dev);
-
-/*
- * vfs pointer to mount info.
- */
-#define	vftomi(vfsp)		((struct coda_mntinfo *)(vfsp->mnt_data))
-#define	CODA_MOUNTED(vfsp)	(vftomi((vfsp)) != NULL)
-
-/*
- * vnode pointer to mount info.
- */
-#define	vtomi(vp)	((struct coda_mntinfo *)(vp->v_mount->mnt_data))
-
-/*
- * Used for identifying usage of "Control" object.
- */
-extern struct vnode *coda_ctlvp;
-#define	IS_CTL_VP(vp)			((vp) == coda_ctlvp)
-#define	IS_CTL_NAME(vp, name, l)	((l == CODA_CONTROLLEN)		\
-    && ((vp) == vtomi((vp))->mi_rootvp) &&				\
-    strncmp(name, CODA_CONTROL, l) == 0)
-
-/*
- * An enum to tell us whether something that will remove a reference to a
- * cnode was a downcall or not.
- */
-enum dc_status {
-	IS_DOWNCALL = 6,
-	NOT_DOWNCALL = 7
-};
-
-/* cfs_psdev.h */
-int	coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
-	    caddr_t buffer);
-
-extern int coda_kernel_version;
-
-/* cfs_subr.h */
-int	handleDownCall(struct coda_mntinfo *mnt, int opcode,
-	    union outputArgs *out);
-void	coda_unmounting(struct mount *whoIam);
-int	coda_vmflush(struct cnode *cp);
-
-/* cfs_vnodeops.h */
-struct cnode	*make_coda_node(struct CodaFid *fid, struct mount *vfsp,
-		 short type);
-int		 coda_vnodeopstats_init(void);
-
-/* sigh */
-#define	CODA_RDWR	((u_long) 31)
-
-#endif /* _CNODE_H_ */
diff --git a/sys/fs/coda/coda.h b/sys/fs/coda/coda.h
deleted file mode 100644
index 2cfb712..0000000
--- a/sys/fs/coda/coda.h
+++ /dev/null
@@ -1,838 +0,0 @@
-/*-
- * 
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- * 
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- * 
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- * 
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- * 
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- * 
- * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- * $FreeBSD$
- * 
- */
-
-
-/*
- *
- * Based on cfs.h from Mach, but revamped for increased simplicity.
- * Linux modifications by Peter Braam, Aug 1996
- */
-
-#ifndef _CODA_HEADER_
-#define _CODA_HEADER_
-
-#ifdef _KERNEL
-#include "opt_coda.h"	/* for CODA_COMPAT_5 option */
-#endif
-
-/* Avoid CODA_COMPAT_5 redefinition in coda5 module */
-#if defined (CODA5_MODULE) && !defined(CODA_COMPAT_5)
-#define CODA_COMPAT_5
-#endif
-
-/* Catch new _KERNEL defn for NetBSD */
-#ifdef __NetBSD__
-#include <sys/types.h>
-#endif 
-
-#ifndef CODA_MAXSYMLINKS
-#define CODA_MAXSYMLINKS 10
-#endif
-
-#if defined(DJGPP) || defined(__CYGWIN32__)
-#ifdef _KERNEL
-typedef unsigned long u_long;
-typedef unsigned int u_int;
-typedef unsigned short u_short;
-typedef u_long ino_t;
-typedef u_long struct cdev *;
-typedef void * caddr_t;
-#ifdef DOS
-typedef unsigned __int64 u_quad_t;
-#else 
-typedef unsigned long long u_quad_t;
-#endif
-
-#define inline
-
-struct timespec {
-        long       ts_sec;
-        long       ts_nsec;
-};
-#else  /* DJGPP but not _KERNEL */
-#include <sys/types.h>
-#include <sys/time.h>
-typedef unsigned long long u_quad_t;
-#endif /* !_KERNEL */
-#endif /* !DJGPP */
-
-
-#if defined(__linux__)
-#define cdev_t u_quad_t
-#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
-#define _UQUAD_T_ 1
-typedef unsigned long long u_quad_t;
-#endif
-#else
-#define cdev_t dev_t
-#endif
-
-#ifdef __CYGWIN32__
-typedef unsigned char u_int8_t;
-struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* nanoseconds */
-};
-#endif
-
-typedef u_int32_t cuid_t;
-typedef u_int32_t cgid_t;
-
-/*
- * Cfs constants
- */
-#define CODA_MAXNAMLEN   255
-#define CODA_MAXPATHLEN  1024
-#define CODA_MAXSYMLINK  10
-
-/* these are Coda's version of O_RDONLY etc combinations
- * to deal with VFS open modes
- */
-#define	C_O_READ	0x001
-#define	C_O_WRITE       0x002
-#define C_O_TRUNC       0x010
-#define C_O_EXCL	0x100
-#define C_O_CREAT	0x200
-
-/* these are to find mode bits in Venus */ 
-#define C_M_READ  00400
-#define C_M_WRITE 00200
-
-/* for access Venus will use */
-#define C_A_C_OK    8               /* Test for writing upon create.  */
-#define C_A_R_OK    4               /* Test for read permission.  */
-#define C_A_W_OK    2               /* Test for write permission.  */
-#define C_A_X_OK    1               /* Test for execute permission.  */
-#define C_A_F_OK    0               /* Test for existence.  */
-
-
-#ifndef _VENUS_DIRENT_T_
-#define _VENUS_DIRENT_T_ 1
-struct venus_dirent {
-        unsigned int	d_fileno;		/* file number of entry */
-        unsigned short	d_reclen;		/* length of this record */
-        unsigned char	d_type;			/* file type, see below */
-        unsigned char	d_namlen;		/* length of string in d_name */
-        char		d_name[CODA_MAXNAMLEN + 1];/* name must be no longer than this */
-};
-#undef DIRSIZ
-#define DIRSIZ(dp)      ((sizeof (struct venus_dirent) - (CODA_MAXNAMLEN+1)) + \
-                         (((dp)->d_namlen+1 + 3) &~ 3))
-
-/*
- * File types
- */
-#define	CDT_UNKNOWN	 0
-#define	CDT_FIFO	 1
-#define	CDT_CHR		 2
-#define	CDT_DIR		 4
-#define	CDT_BLK		 6
-#define	CDT_REG		 8
-#define	CDT_LNK		10
-#define	CDT_SOCK	12
-#define	CDT_WHT		14
-
-/*
- * Convert between stat structure types and directory types.
- */
-#define	IFTOCDT(mode)	(((mode) & 0170000) >> 12)
-#define	CDTTOIF(dirtype)	((dirtype) << 12)
-
-#endif
-
-#ifdef CODA_COMPAT_5
-
-struct CodaFid {
-    u_long Volume;
-    u_long Vnode;
-    u_long Unique;      
-};
-
-static __inline__ ino_t coda_f2i(struct CodaFid *fid)
-{
-	if (!fid) return 0;
-	return (fid->Unique + (fid->Vnode<<10) + (fid->Volume<<20));
-}
-
-static __inline__ char * coda_f2s(struct CodaFid *fid)
-{
-  static char fid_str [35];
-  snprintf (fid_str, 35, "[%lx.%lx.%lx]", fid->Volume,
-	    fid->Vnode, fid->Unique);
-  return fid_str;
-}
- 
-static __inline__ int coda_fid_eq (struct CodaFid *fid1, struct CodaFid *fid2)
-{
-  return (fid1->Volume == fid2->Volume &&
-	  fid1->Vnode == fid2->Vnode &&
-	  fid1->Unique == fid2->Unique);
-}
-  
-struct coda_cred {
-    u_int32_t cr_uid, cr_euid, cr_suid, cr_fsuid; /* Real, efftve, set, fs uid*/
-    u_int32_t cr_groupid,     cr_egid, cr_sgid, cr_fsgid; /* same for groups */
-};
-
-#else	/* CODA_COMPAT_5 */
-
-struct CodaFid {
-	u_int32_t opaque[4];
-};
-
-static __inline__ ino_t  coda_f2i(struct CodaFid *fid)
-{
-    if ( ! fid ) 
-	return 0; 
-    return (fid->opaque[3] ^ (fid->opaque[2]<<10) ^ (fid->opaque[1]<<20) ^ fid->opaque[0]);
-}
-	
-static __inline__ char * coda_f2s(struct CodaFid *fid)
- {
-     static char fid_str [35];
-     snprintf (fid_str, 35, "[%x.%x.%x.%x]", fid->opaque[0],
-	       fid->opaque[1], fid->opaque[2], fid->opaque[3]);
-     return fid_str;
- }
-
-static __inline__ int coda_fid_eq (struct CodaFid *fid1, struct CodaFid *fid2)
-{
-  return (fid1->opaque[0] == fid2->opaque[0] &&
-	  fid1->opaque[1] == fid2->opaque[1] &&
-	  fid1->opaque[2] == fid2->opaque[2] &&
-	  fid1->opaque[3] == fid2->opaque[3]);
-}
-
-#endif	/* CODA_COMPAT_5 */
-
-#ifndef _VENUS_VATTR_T_
-#define _VENUS_VATTR_T_
-/*
- * Vnode types.  VNON means no type.
- */
-enum coda_vtype	{ C_VNON, C_VREG, C_VDIR, C_VBLK, C_VCHR, C_VLNK, C_VSOCK, C_VFIFO, C_VBAD };
-
-struct coda_vattr {
-	long     	va_type;	/* vnode type (for create) */
-	u_short		va_mode;	/* files access mode and type */
-	short		va_nlink;	/* number of references to file */
-	cuid_t		va_uid;		/* owner user id */
-	cgid_t		va_gid;		/* owner group id */
-	long		va_fileid;	/* file id */
-	u_quad_t	va_size;	/* file size in bytes */
-	long		va_blocksize;	/* blocksize preferred for i/o */
-	struct timespec	va_atime;	/* time of last access */
-	struct timespec	va_mtime;	/* time of last modification */
-	struct timespec	va_ctime;	/* time file changed */
-	u_long		va_gen;		/* generation number of file */
-	u_long		va_flags;	/* flags defined for file */
-	cdev_t	        va_rdev;	/* device special file represents */
-	u_quad_t	va_bytes;	/* bytes of disk space held by file */
-	u_quad_t	va_filerev;	/* file modification number */
-};
-
-#endif 
-
-/* structure used by CODA_STATFS for getting cache information from venus */
-struct coda_statfs {
-    int32_t f_blocks;
-    int32_t f_bfree;
-    int32_t f_bavail;
-    int32_t f_files;
-    int32_t f_ffree;
-};
-
-/*
- * Kernel <--> Venus communications.
- */
-
-#define CODA_ROOT	2
-#define CODA_OPEN_BY_FD	3
-#define CODA_OPEN	4
-#define CODA_CLOSE	5
-#define CODA_IOCTL	6
-#define CODA_GETATTR	7
-#define CODA_SETATTR	8
-#define CODA_ACCESS	9
-#define CODA_LOOKUP	10
-#define CODA_CREATE	11
-#define CODA_REMOVE	12
-#define CODA_LINK	13
-#define CODA_RENAME	14
-#define CODA_MKDIR	15
-#define CODA_RMDIR	16
-#define CODA_READDIR	17
-#define CODA_SYMLINK	18
-#define CODA_READLINK	19
-#define CODA_FSYNC	20
-#define CODA_INACTIVE	21
-#define CODA_VGET	22
-#define CODA_SIGNAL	23
-#define CODA_REPLACE	24
-#define CODA_FLUSH       25
-#define CODA_PURGEUSER   26
-#define CODA_ZAPFILE     27
-#define CODA_ZAPDIR      28
-#define CODA_PURGEFID    30
-#define CODA_OPEN_BY_PATH 31
-#define CODA_RESOLVE     32
-#define CODA_REINTEGRATE 33
-#define CODA_STATFS	 34
-#define CODA_NCALLS 35
-
-#define DOWNCALL(opcode) (opcode >= CODA_REPLACE && opcode <= CODA_PURGEFID)
-
-#define VC_MAXDATASIZE	    8192
-#define VC_MAXMSGSIZE      sizeof(union inputArgs)+sizeof(union outputArgs) +\
-                            VC_MAXDATASIZE  
-
-#define CIOC_KERNEL_VERSION _IOWR('c', 10, int)
-#if	0
-	/* don't care about kernel version number */
-#define CODA_KERNEL_VERSION 0
-	/* The old venus 4.6 compatible interface */
-#define CODA_KERNEL_VERSION 1
-#endif  /* realms/cells */
-#ifdef CODA_COMPAT_5
-	/* venus_lookup gets an extra parameter to aid windows.*/
-#define CODA_KERNEL_VERSION 2
-#else
-	/* 128-bit fids for realms */
-#define CODA_KERNEL_VERSION 3 
-#endif
-
-/*
- *        Venus <-> Coda  RPC arguments
- */
-#ifdef CODA_COMPAT_5
-struct coda_in_hdr {
-    unsigned long opcode;
-    unsigned long unique;           /* Keep multiple outstanding msgs distinct */
-    u_short pid;                    /* Common to all */
-    u_short pgid;                   /* Common to all */
-    u_short sid;                    /* Common to all */
-    struct coda_cred cred;          /* Common to all */    
-};
-#else
-struct coda_in_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;	    /* Keep multiple outstanding msgs distinct */
-    pid_t pid;
-    pid_t pgid;
-    cuid_t uid;
-};
-#endif
-
-/* Really important that opcode and unique are 1st two fields! */
-struct coda_out_hdr {
-    u_int32_t opcode;
-    u_int32_t unique;	
-    u_int32_t result;
-};
-
-/* coda_root: NO_IN */
-struct coda_root_out {
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-};
-
-struct coda_root_in {
-    struct coda_in_hdr in;
-};
-
-/* coda_sync: */
-/* Nothing needed for coda_sync */
-
-/* coda_open: */
-struct coda_open_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int	flags;
-};
-
-struct coda_open_out {
-    struct coda_out_hdr oh;
-    cdev_t	dev;
-    ino_t	inode;
-};
-
-
-/* coda_close: */
-struct coda_close_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int	flags;
-};
-
-struct coda_close_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_ioctl: */
-struct coda_ioctl_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-    int	cmd;
-    int	len;
-    int	rwflag;
-    char *data;			/* Place holder for data. */
-};
-
-struct coda_ioctl_out {
-    struct coda_out_hdr oh;
-    int	len;
-    caddr_t	data;		/* Place holder for data. */
-};
-
-
-/* coda_getattr: */
-struct coda_getattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-};
-
-struct coda_getattr_out {
-    struct coda_out_hdr oh;
-    struct coda_vattr attr;
-};
-
-
-/* coda_setattr: NO_OUT */
-struct coda_setattr_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-    struct coda_vattr attr;
-};
-
-struct coda_setattr_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_access: NO_OUT */
-struct coda_access_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int	flags;
-};
-
-struct coda_access_out {
-    struct coda_out_hdr out;
-};
-
-
-/* lookup flags */
-#define CLU_CASE_SENSITIVE     0x01
-#define CLU_CASE_INSENSITIVE   0x02
-
-/* coda_lookup: */
-struct  coda_lookup_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int         name;		/* Place holder for data. */
-    int         flags;	
-};
-
-struct coda_lookup_out {
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-    int	vtype;
-};
-
-
-/* coda_create: */
-struct coda_create_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-    struct coda_vattr attr;
-    int excl;
-    int mode;
-    int 	name;		/* Place holder for data. */
-};
-
-struct coda_create_out {
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_remove: NO_OUT */
-struct coda_remove_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int name;		/* Place holder for data. */
-};
-
-struct coda_remove_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_link: NO_OUT */
-struct coda_link_in {
-    struct coda_in_hdr ih;
-    struct CodaFid sourceFid;          /* cnode to link *to* */
-    struct CodaFid destFid;            /* Directory in which to place link */
-    int tname;		/* Place holder for data. */
-};
-
-struct coda_link_out {
-    struct coda_out_hdr out;
-};
-
-
-/* coda_rename: NO_OUT */
-struct coda_rename_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	sourceFid;
-    int 	srcname;
-    struct CodaFid destFid;
-    int 	destname;
-};
-
-struct coda_rename_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_mkdir: */
-struct coda_mkdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    struct coda_vattr attr;
-    int	   name;		/* Place holder for data. */
-};
-
-struct coda_mkdir_out {
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-    struct coda_vattr attr;
-};
-
-
-/* coda_rmdir: NO_OUT */
-struct coda_rmdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int name;		/* Place holder for data. */
-};
-
-struct coda_rmdir_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_readdir: */
-struct coda_readdir_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int	count;
-    int	offset;
-};
-
-struct coda_readdir_out {
-    struct coda_out_hdr oh;
-    int	size;
-    caddr_t	data;		/* Place holder for data. */
-};
-
-/* coda_symlink: NO_OUT */
-struct coda_symlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;          /* Directory to put symlink in */
-    int srcname;
-    struct coda_vattr attr;
-    int tname;
-};
-
-struct coda_symlink_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_readlink: */
-struct coda_readlink_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-};
-
-struct coda_readlink_out {
-    struct coda_out_hdr oh;
-    int	count;
-    caddr_t	data;		/* Place holder for data. */
-};
-
-
-/* coda_fsync: NO_OUT */
-struct coda_fsync_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-};
-
-struct coda_fsync_out {
-    struct coda_out_hdr out;
-};
-
-/* coda_inactive: NO_OUT */
-struct coda_inactive_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-};
-
-/* coda_vget: */
-struct coda_vget_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-};
-
-struct coda_vget_out {
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-    int	vtype;
-};
-
-
-/* CODA_SIGNAL is out-of-band, doesn't need data. */
-/* CODA_INVALIDATE is a venus->kernel call */
-/* CODA_FLUSH is a venus->kernel call */
-
-/* coda_purgeuser: */
-/* CODA_PURGEUSER is a venus->kernel call */
-struct coda_purgeuser_out {
-    struct coda_out_hdr oh;
-#ifdef CODA_COMPAT_5
-    struct coda_cred cred;
-#else
-    cuid_t uid;
-#endif
-};
-
-/* coda_zapfile: */
-/* CODA_ZAPFILE is a venus->kernel call */
-struct coda_zapfile_out {  
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-};
-
-/* coda_zapdir: */
-/* CODA_ZAPDIR is a venus->kernel call */	
-struct coda_zapdir_out {	  
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-};
-
-/* coda_zapnode: */
-/* CODA_ZAPVNODE is a venus->kernel call */	
-struct coda_zapvnode_out { 
-    struct coda_out_hdr oh;
-#ifdef CODA_COMPAT_5
-    struct coda_cred cred;
-#endif
-    struct CodaFid Fid;
-};
-
-/* coda_purgefid: */
-/* CODA_PURGEFID is a venus->kernel call */	
-struct coda_purgefid_out { 
-    struct coda_out_hdr oh;
-    struct CodaFid Fid;
-};
-
-/* coda_replace: */
-/* CODA_REPLACE is a venus->kernel call */	
-struct coda_replace_out { /* coda_replace is a venus->kernel call */
-     struct coda_out_hdr oh;
-    struct CodaFid NewFid;
-    struct CodaFid OldFid;
-};
-
-/* coda_open_by_fd: */
-struct coda_open_by_fd_in {
-    struct coda_in_hdr ih;
-    struct CodaFid Fid;
-    int	flags;
-};
-
-struct coda_open_by_fd_out {
-    struct coda_out_hdr oh;
-    int fd;
-#ifdef _KERNEL
-    /* not passed from userspace but used in-kernel only */
-    struct vnode *vp;
-#endif
-};
-
-/* coda_open_by_path: */
-struct coda_open_by_path_in {
-    struct coda_in_hdr ih;
-    struct CodaFid	Fid;
-    int	flags;
-};
-
-struct coda_open_by_path_out {
-    struct coda_out_hdr oh;
-    int path;
-};
-
-/* coda_statfs: NO_IN */
-struct coda_statfs_in {
-    struct coda_in_hdr ih;
-};
-
-struct coda_statfs_out {
-    struct coda_out_hdr oh;
-    struct coda_statfs stat;
-};
-
-/* 
- * Occasionally, we don't cache the fid returned by CODA_LOOKUP. 
- * For instance, if the fid is inconsistent. 
- * This case is handled by setting the top bit of the type result parameter.
- */
-#define CODA_NOCACHE          0x80000000
-
-union inputArgs {
-    struct coda_in_hdr ih;		/* NB: every struct below begins with an ih */
-    struct coda_open_in coda_open;
-    struct coda_close_in coda_close;
-    struct coda_ioctl_in coda_ioctl;
-    struct coda_getattr_in coda_getattr;
-    struct coda_setattr_in coda_setattr;
-    struct coda_access_in coda_access;
-    struct coda_lookup_in coda_lookup;
-    struct coda_create_in coda_create;
-    struct coda_remove_in coda_remove;
-    struct coda_link_in coda_link;
-    struct coda_rename_in coda_rename;
-    struct coda_mkdir_in coda_mkdir;
-    struct coda_rmdir_in coda_rmdir;
-    struct coda_readdir_in coda_readdir;
-    struct coda_symlink_in coda_symlink;
-    struct coda_readlink_in coda_readlink;
-    struct coda_fsync_in coda_fsync;
-    struct coda_vget_in coda_vget;
-    struct coda_open_by_fd_in coda_open_by_fd;
-    struct coda_open_by_path_in coda_open_by_path;
-    struct coda_statfs_in coda_statfs;
-};
-
-union outputArgs {
-    struct coda_out_hdr oh;		/* NB: every struct below begins with an oh */
-    struct coda_root_out coda_root;
-    struct coda_open_out coda_open;
-    struct coda_ioctl_out coda_ioctl;
-    struct coda_getattr_out coda_getattr;
-    struct coda_lookup_out coda_lookup;
-    struct coda_create_out coda_create;
-    struct coda_mkdir_out coda_mkdir;
-    struct coda_readdir_out coda_readdir;
-    struct coda_readlink_out coda_readlink;
-    struct coda_vget_out coda_vget;
-    struct coda_purgeuser_out coda_purgeuser;
-    struct coda_zapfile_out coda_zapfile;
-    struct coda_zapdir_out coda_zapdir;
-    struct coda_zapvnode_out coda_zapvnode;
-    struct coda_purgefid_out coda_purgefid;
-    struct coda_replace_out coda_replace;
-    struct coda_open_by_fd_out coda_open_by_fd;
-    struct coda_open_by_path_out coda_open_by_path;
-    struct coda_statfs_out coda_statfs;
-};    
-
-union coda_downcalls {
-    /* CODA_INVALIDATE is a venus->kernel call */
-    /* CODA_FLUSH is a venus->kernel call */
-    struct coda_purgeuser_out purgeuser;
-    struct coda_zapfile_out zapfile;
-    struct coda_zapdir_out zapdir;
-    struct coda_zapvnode_out zapvnode;
-    struct coda_purgefid_out purgefid;
-    struct coda_replace_out replace;
-};
-
-
-/*
- * Used for identifying usage of "Control" and pioctls
- */
-
-#define PIOCPARM_MASK 0x0000ffff
-struct ViceIoctl {
-        caddr_t in, out;        /* Data to be transferred in, or out */
-        unsigned short in_size;	/* Size of input buffer <= 8K */
-        unsigned short out_size; /* Maximum size of output buffer, <= 8K */
-};
-
-#if defined(__CYGWIN32__) || defined(DJGPP)
-struct PioctlData {
-	unsigned long cmd;
-        const char *path;
-        int follow;
-        struct ViceIoctl vi;
-};
-#else
-struct PioctlData {
-        const char *path;
-        int follow;
-        struct ViceIoctl vi;
-};
-#endif
-
-#define	CODA_CONTROL		".CONTROL"
-#define CODA_CONTROLLEN           8
-#define	CTL_VOL			-1
-#define	CTL_VNO			-1
-#define	CTL_UNI			-1
-#define CTL_INO                 -1
-#define	CTL_FILE		"/coda/.CONTROL"
-
-#ifdef CODA_COMPAT_5
-#define CTL_FID			{ -1, -1, -1 }
-#define IS_CTL_FID(fidp)	((fidp)->Volume == -1 &&\
-				 (fidp)->Vnode == -1 &&\
-				 (fidp)->Unique == -1)
-#define INVAL_FID		{ 0, 0, 0 }
-#else
-#define	CTL_FID			{ { -1, -1, -1, -1 } }
-#define	IS_CTL_FID(fidp)	((fidp)->opaque[1] == CTL_VOL && \
-				(fidp)->opaque[2] == CTL_VNO && \
-				(fidp)->opaque[3] == CTL_UNI)
-#define	INVAL_FID		{ { 0, 0, 0, 0 } }
-#endif
-
-/* Data passed to mount */
-
-#define CODA_MOUNT_VERSION 1
-
-struct coda_mount_data {
-	int		version;
-	int		fd;       /* Opened device */
-};
-
-#endif 
-
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
deleted file mode 100644
index 62d0857..0000000
--- a/sys/fs/coda/coda_fbsd.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/ucred.h>
-#include <sys/vnode.h>
-
-#include <vm/vm.h>
-#include <vm/vnode_pager.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_vnops.h>
-#include <fs/coda/coda_psdev.h>
-
-static struct cdevsw codadevsw = {
-	.d_version =	D_VERSION,
-	.d_flags =	D_NEEDGIANT,
-	.d_open =	vc_open,
-	.d_close =	vc_close,
-	.d_read =	vc_read,
-	.d_write =	vc_write,
-	.d_ioctl =	vc_ioctl,
-	.d_poll =	vc_poll,
-	.d_name =	"coda",
-};
-
-static eventhandler_tag clonetag;
-
-static LIST_HEAD(, coda_mntinfo) coda_mnttbl;
-
-/*
- * For DEVFS, using bpf & tun drivers as examples.
- *
- * XXX: Why use a cloned interface, aren't we really just interested in
- * having a single /dev/cfs0?  It's not clear the coda module knows what to
- * do with more than one.
- */
-static void coda_fbsd_clone(void *arg, struct ucred *cred, char *name,
-    int namelen, struct cdev **dev);
-
-static int
-codadev_modevent(module_t mod, int type, void *data)
-{
-	struct coda_mntinfo *mnt;
-
-	switch (type) {
-	case MOD_LOAD:
-		LIST_INIT(&coda_mnttbl);
-		clonetag = EVENTHANDLER_REGISTER(dev_clone, coda_fbsd_clone,
-		    0, 1000);
-		break;
-
-	case MOD_UNLOAD:
-		/*
-		 * XXXRW: At the very least, a busy check should occur here
-		 * to prevent untimely unload.  Much more serious collection
-		 * of allocated memory needs to take place; right now we leak
-		 * like a sieve.
-		 */
-		EVENTHANDLER_DEREGISTER(dev_clone, clonetag);
-		while ((mnt = LIST_FIRST(&coda_mnttbl)) != NULL) {
-			LIST_REMOVE(mnt, mi_list);
-			destroy_dev(mnt->dev);
-			free(mnt, M_CODA);
-		}
-		break;
-
-	default:
-		return (EOPNOTSUPP);
-	}
-	return (0);
-}
-
-static moduledata_t codadev_mod = {
-	"codadev",
-	codadev_modevent,
-	NULL
-};
-DECLARE_MODULE(codadev, codadev_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE);
-
-static void
-coda_fbsd_clone(void *arg, struct ucred *cred, char *name, int namelen,
-    struct cdev **dev)
-{
-	struct coda_mntinfo *mnt;
-	int u;
-
-	if (*dev != NULL)
-		return;
-	if (dev_stdclone(name, NULL, "cfs", &u) != 1)
-		return;
-	*dev = make_dev(&codadevsw, u, UID_ROOT, GID_WHEEL, 0600,
-	    "cfs%d", u);
-	dev_ref(*dev);
-	mnt = malloc(sizeof(struct coda_mntinfo), M_CODA, M_WAITOK|M_ZERO);
-	LIST_INSERT_HEAD(&coda_mnttbl, mnt, mi_list);
-	mnt->dev = *dev;
-}
-
-struct coda_mntinfo *
-dev2coda_mntinfo(struct cdev *dev)
-{
-	struct coda_mntinfo *mnt;
-
-	LIST_FOREACH(mnt, &coda_mnttbl, mi_list) {
-		if (mnt->dev == dev)
-			return (mnt);
-	}
-	return (NULL);
-}
diff --git a/sys/fs/coda/coda_io.h b/sys/fs/coda/coda_io.h
deleted file mode 100644
index 6058cf0..0000000
--- a/sys/fs/coda/coda_io.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- *
- */
-
-/*-
- * Mach Operating System
- * Copyright (c) 1990 Carnegie-Mellon University
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon University.
- * Contributers include David Steere, James Kistler, and M. Satyanarayanan.
- */
-
-#ifndef _CODAIO_H_
-#define	_CODAIO_H_
-
-/*
- * Define ioctl commands for vcioctl, /dev/cfs.
- *
- * Resize Coda namecache.
- */
-#define	CODARESIZE	_IOW('c', 1, struct coda_resize)
-
-/*
- * Collect statistics.
- */
-#define	CODASTATS	_IO('c', 2)
-
-/*
- * Print cache.
- */
-#define	CODAPRINT	_IO('c', 3)
-#define	CODATEST	_IO('c', 4)
-
-struct coda_resize {
-	int hashsize;
-	int heapsize;
-};
-
-#endif /* !_CODAIO_H_ */
diff --git a/sys/fs/coda/coda_opstats.h b/sys/fs/coda/coda_opstats.h
deleted file mode 100644
index 36805e8..0000000
--- a/sys/fs/coda/coda_opstats.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- *
- */
-
-#ifndef _CODA_OPSTATS_H_
-#define	_CODA_OPSTATS_H_
-
-/*
- * Operation stats: what the minicache can intercept that *isn't* seen by
- * venus.  These stats are kept to augment the stats maintained by the
- * Volume-Session mechanism.
- */
-
-/*-
- * vfsops:
- *          mount: not currently bounced to Venus
- *          umount: nope
- *          root: only first call, rest is cached.
- *          statfs: none (bogus)
- *          sync: none (bogus)
- *          vget: all
- */
-#define	CODA_MOUNT_STATS	0
-#define	CODA_UMOUNT_STATS	1
-#define	CODA_ROOT_STATS		2
-#define	CODA_STATFS_STATS	3
-#define	CODA_SYNC_STATS		4
-#define	CODA_VGET_STATS		5
-#define	CODA_VFSOPS_SIZE	6
-
-/*-
- * vnodeops:
- *            open: all to venus
- *            close: all to venus
- *            rdrw: bogus.  Maybe redirected to UFS.
- *                          May call open/close for internal opens/closes
- *                          (Does exec not call open?)
- *            ioctl: causes a lookupname
- *                   passes through
- *            select: can't get there from here.
- *            getattr: can be satsified by cache
- *            setattr: all go through
- *            access: can be satisfied by cache
- *            readlink: can be satisfied by cache
- *            fsync: passes through
- *            inactive: passes through
- *            lookup: can be satisfied by cache
- *            create: passes through
- *            remove: passes through
- *            link: passes through
- *            rename: passes through
- *            mkdir: passes through
- *            rmdir: passes through
- *            symlink: passes through
- *            readdir: may be redirected to UFS
- *                     may cause an "internal" open/close
- */
-#define	CODA_OPEN_STATS		0
-#define	CODA_CLOSE_STATS	1
-#define	CODA_RDWR_STATS		2
-#define	CODA_IOCTL_STATS	3
-#define	CODA_SELECT_STATS	4
-#define	CODA_GETATTR_STATS	5
-#define	CODA_SETATTR_STATS	6
-#define	CODA_ACCESS_STATS	7
-#define	CODA_READLINK_STATS	8
-#define	CODA_FSYNC_STATS	9
-#define	CODA_INACTIVE_STATS	10
-#define	CODA_LOOKUP_STATS	11
-#define	CODA_CREATE_STATS	12
-#define	CODA_REMOVE_STATS	13
-#define	CODA_LINK_STATS		14
-#define	CODA_RENAME_STATS	15
-#define	CODA_MKDIR_STATS	16
-#define	CODA_RMDIR_STATS	17
-#define	CODA_SYMLINK_STATS	18
-#define	CODA_READDIR_STATS	19
-#define	CODA_VNODEOPS_SIZE	20
-
-/*
- * I propose the following structres:
- */
-struct coda_op_stats {
-	int	opcode;		/* vfs opcode */
-	long	entries;	/* number of times call attempted */
-	long	sat_intrn;	/* number of times call satisfied by cache */
-	long	unsat_intrn;	/* number of times call failed in cache, but */
-				/*  was not bounced to venus proper. */
-	long	gen_intrn;	/* number of times call generated internally */
-				/* (do we need that?) */
-};
-
-/*
- * With each call to the minicache, we'll bump the counters whenver a call is
- * satisfied internally (through the cache or through a redirect), and
- * whenever an operation is caused internally.  Then, we can add the total
- * operations caught by the minicache to the world-wide totals, and leave a
- * caveat for the specific graphs later.
- */
-
-#endif /* !_CODA_OPSTATS_H_ */
diff --git a/sys/fs/coda/coda_pioctl.h b/sys/fs/coda/coda_pioctl.h
deleted file mode 100644
index 3c9d0c6..0000000
--- a/sys/fs/coda/coda_pioctl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- *
- */
-
-/*-
- * Mach Operating System
- * Copyright (c) 1989 Carnegie-Mellon University
- * Copyright (c) 1988 Carnegie-Mellon University
- * Copyright (c) 1987 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * ITC Remote filesystem - vice ioctl interface module
- *
- * TODO:  Find /usr/local/include/viceioctl.h.
- */
-
-#ifndef	_SYS_PIOCTL_H_
-#define	_SYS_PIOCTL_H_
-
-/*
- * The 2K limits above are a consequence of the size of the kernel buffer
- * used to buffer requests from the user to venus--2*MAXPATHLEN.  The buffer
- * pointers may be null, or the counts may be 0 if there are no input or
- * output parameters.
- */
-#define	_VICEIOCTL(id)	((unsigned int )_IOW('V', id, struct ViceIoctl))
-
-/*
- * Use this macro to define up to 256 vice ioctl's.  These ioctl's all
- * potentially have in/out parameters--this depends upon the values in the
- * ViceIoctl structure.  This structure is itself passed into the kernel by
- * the normal ioctl parameter passing mechanism.
- */
-#define	_VALIDVICEIOCTL(com)	(com >= _VICEIOCTL(0) &&		\
-				    com <= _VICEIOCTL(255))
-
-#endif /* !_SYS_PIOCTL_H_ */
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
deleted file mode 100644
index e982a2c..0000000
--- a/sys/fs/coda/coda_psdev.c
+++ /dev/null
@@ -1,675 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-/*-
- * Mach Operating System
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon
- * University.  Contributers include David Steere, James Kistler, and
- * M. Satyanarayanan.  */
-
-/*
- * These routines define the psuedo device for communication between Coda's
- * Venus and Minicache in Mach 2.6. They used to be in cfs_subr.c, but I
- * moved them to make it easier to port the Minicache without porting coda.
- * -- DCS 10/12/94
- */
-
-/*
- * These routines are the device entry points for Venus.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/capability.h>
-#include <sys/conf.h>
-#include <sys/ioccom.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/file.h>		/* must come after sys/malloc.h */
-#include <sys/mount.h>
-#include <sys/mutex.h>
-#include <sys/poll.h>
-#include <sys/proc.h>
-#include <sys/filedesc.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_io.h>
-#include <fs/coda/coda_psdev.h>
-
-/*
- * Variables to determine how Coda sleeps and whether or not it is
- * interruptible when it does sleep waiting for Venus.
- */
-/* #define	CTL_C */
-
-#ifdef CTL_C
-#include <sys/signalvar.h>
-#endif
-
-int coda_psdev_print_entry = 0;
-static int outstanding_upcalls = 0;
-int coda_call_sleep = PZERO - 1;
-#ifdef CTL_C
-int coda_pcatch = PCATCH;
-#else
-#endif
-
-#define	ENTRY do {							\
-	if (coda_psdev_print_entry)					\
-		myprintf(("Entered %s\n", __func__));			\
-} while (0)
-
-struct vmsg {
-	TAILQ_ENTRY(vmsg)	vm_chain;
-	caddr_t		vm_data;
-	u_short		vm_flags;
-	u_short		vm_inSize;	/* Size is at most 5000 bytes */
-	u_short		vm_outSize;
-	u_short		vm_opcode;	/* Copied from data to save ptr deref */
-	int		vm_unique;
-	caddr_t		vm_sleep;	/* Not used by Mach. */
-};
-
-#define	VM_READ		1
-#define	VM_WRITE	2
-#define	VM_INTR		4		/* Unused. */
-
-int
-vc_open(struct cdev *dev, int flag, int mode, struct thread *td)
-{
-	struct vcomm *vcp;
-	struct coda_mntinfo *mnt;
-
-	ENTRY;
-	mnt = dev2coda_mntinfo(dev);
-	KASSERT(mnt, ("Coda: tried to open uninitialized cfs device"));
-	vcp = &mnt->mi_vcomm;
-	if (VC_OPEN(vcp))
-		return (EBUSY);
-	bzero(&(vcp->vc_selproc), sizeof (struct selinfo));
-	TAILQ_INIT(&vcp->vc_requests);
-	TAILQ_INIT(&vcp->vc_replies);
-	MARK_VC_OPEN(vcp);
-	mnt->mi_vfsp = NULL;
-	mnt->mi_rootvp = NULL;
-	return (0);
-}
-
-int
-vc_close(struct cdev *dev, int flag, int mode, struct thread *td)
-{
-	struct vcomm *vcp;
-	struct vmsg *vmp, *nvmp = NULL;
-	struct coda_mntinfo *mi;
-	int err;
-
-	ENTRY;
-	mi = dev2coda_mntinfo(dev);
-	KASSERT(mi, ("Coda: closing unknown cfs device"));
-	vcp = &mi->mi_vcomm;
-	KASSERT(VC_OPEN(vcp), ("Coda: closing unopened cfs device"));
-
-	/*
-	 * Prevent future operations on this vfs from succeeding by
-	 * auto-unmounting any vfs mounted via this device.  This frees user
-	 * or sysadm from having to remember where all mount points are
-	 * located.  Put this before WAKEUPs to avoid queuing new messages
-	 * between the WAKEUP and the unmount (which can happen if we're
-	 * unlucky).
-	 */
-	if (mi->mi_rootvp == NULL) {
-		/*
-		 * Just a simple open/close with no mount.
-		 */
-		MARK_VC_CLOSED(vcp);
-		return (0);
-	}
-
-	/*
-	 * Let unmount know this is for real.
-	 */
-	VTOC(mi->mi_rootvp)->c_flags |= C_UNMOUNTING;
-	coda_unmounting(mi->mi_vfsp);
-
-	/*
-	 * Wakeup clients so they can return.
-	 */
-	outstanding_upcalls = 0;
-	TAILQ_FOREACH_SAFE(vmp, &vcp->vc_requests, vm_chain, nvmp) {
-		/*
-		 * Free signal request messages and don't wakeup cause no one
-		 * is waiting.
-		 */
-		if (vmp->vm_opcode == CODA_SIGNAL) {
-			CODA_FREE((caddr_t)vmp->vm_data,
-			    (u_int)VC_IN_NO_DATA);
-			CODA_FREE((caddr_t)vmp, (u_int)sizeof(struct vmsg));
-			continue;
-		}
-		outstanding_upcalls++;
-		wakeup(&vmp->vm_sleep);
-	}
-	TAILQ_FOREACH(vmp, &vcp->vc_replies, vm_chain) {
-		outstanding_upcalls++;
-		wakeup(&vmp->vm_sleep);
-	}
-	MARK_VC_CLOSED(vcp);
-	if (outstanding_upcalls) {
-#ifdef CODA_VERBOSE
-		printf("presleep: outstanding_upcalls = %d\n",
-		    outstanding_upcalls);
-#endif
-    		(void) tsleep(&outstanding_upcalls, coda_call_sleep,
-		    "coda_umount", 0);
-#ifdef CODA_VERBOSE
-		printf("postsleep: outstanding_upcalls = %d\n",
-		    outstanding_upcalls);
-#endif
-	}
-	err = dounmount(mi->mi_vfsp, flag, td);
-	if (err)
-		myprintf(("Error %d unmounting vfs in vcclose(%s)\n", err,
-		    devtoname(dev)));
-	return (0);
-}
-
-int
-vc_read(struct cdev *dev, struct uio *uiop, int flag)
-{
-	struct vcomm *vcp;
-	struct vmsg *vmp;
-	int error = 0;
-
-	ENTRY;
-	vcp = &dev2coda_mntinfo(dev)->mi_vcomm;
-
-	/*
-	 * Get message at head of request queue.
-	 */
-	vmp = TAILQ_FIRST(&vcp->vc_requests);
-	if (vmp == NULL)
-		return (0);	/* Nothing to read */
-
-	/*
-	 * Move the input args into userspace.
-	 *
-	 * XXXRW: This is not safe in the presence of >1 reader, as vmp is
-	 * still on the head of the list.
-	 */
-	uiop->uio_rw = UIO_READ;
-	error = uiomove(vmp->vm_data, vmp->vm_inSize, uiop);
-	if (error) {
-		myprintf(("vcread: error (%d) on uiomove\n", error));
-		error = EINVAL;
-	}
-	TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
-
-	/*
-	 * If request was a signal, free up the message and don't enqueue it
-	 * in the reply queue.
-	 */
-	if (vmp->vm_opcode == CODA_SIGNAL) {
-		if (codadebug)
-			myprintf(("vcread: signal msg (%d, %d)\n",
-			    vmp->vm_opcode, vmp->vm_unique));
-		CODA_FREE((caddr_t)vmp->vm_data, (u_int)VC_IN_NO_DATA);
-		CODA_FREE((caddr_t)vmp, (u_int)sizeof(struct vmsg));
-		return (error);
-	}
-	vmp->vm_flags |= VM_READ;
-	TAILQ_INSERT_TAIL(&vcp->vc_replies, vmp, vm_chain);
-	return (error);
-}
-
-int
-vc_write(struct cdev *dev, struct uio *uiop, int flag)
-{
-	struct vcomm *vcp;
-	struct vmsg *vmp;
-	struct coda_out_hdr *out;
-	u_long seq;
-	u_long opcode;
-	int buf[2];
-	int error = 0;
-
-	ENTRY;
-	vcp = &dev2coda_mntinfo(dev)->mi_vcomm;
-
-	/*
-	 * Peek at the opcode, unique without transfering the data.
-	 */
-	uiop->uio_rw = UIO_WRITE;
-	error = uiomove((caddr_t)buf, sizeof(int) * 2, uiop);
-	if (error) {
-		myprintf(("vcwrite: error (%d) on uiomove\n", error));
-		return (EINVAL);
-	}
-	opcode = buf[0];
-	seq = buf[1];
-	if (codadebug)
-		myprintf(("vcwrite got a call for %ld.%ld\n", opcode, seq));
-	if (DOWNCALL(opcode)) {
-		union outputArgs pbuf;
-
-		/*
-		 * Get the rest of the data.
-		 */
-		uiop->uio_rw = UIO_WRITE;
-		error = uiomove((caddr_t)&pbuf.coda_purgeuser.oh.result,
-		    sizeof(pbuf) - (sizeof(int)*2), uiop);
-		if (error) {
-			myprintf(("vcwrite: error (%d) on uiomove (Op %ld "
-			    "seq %ld)\n", error, opcode, seq));
-			return (EINVAL);
-		}
-		return (handleDownCall(dev2coda_mntinfo(dev), opcode, &pbuf));
-	}
-
-	/*
-	 * Look for the message on the (waiting for) reply queue.
-	 */
-	TAILQ_FOREACH(vmp, &vcp->vc_replies, vm_chain) {
-		if (vmp->vm_unique == seq)
-			break;
-	}
-	if (vmp == NULL) {
-		if (codadebug)
-			myprintf(("vcwrite: msg (%ld, %ld) not found\n",
-			    opcode, seq));
-		return (ESRCH);
-	}
-
-	/*
-	 * Remove the message from the reply queue.
-	 */
-	TAILQ_REMOVE(&vcp->vc_replies, vmp, vm_chain);
-
-	/*
-	 * Move data into response buffer.
-	 */
-	out = (struct coda_out_hdr *)vmp->vm_data;
-
-	/*
-	 * Don't need to copy opcode and uniquifier.
-	 *
-	 * Get the rest of the data.
-	 */
-	if (vmp->vm_outSize < uiop->uio_resid) {
-		myprintf(("vcwrite: more data than asked for (%d < %zd)\n",
-		    vmp->vm_outSize, uiop->uio_resid));
-
-		/*
-		 * Notify caller of the error.
-		 */
-		wakeup(&vmp->vm_sleep);
-		return (EINVAL);
-	}
-
-	/*
-	 * Save the value.
-	 */
-	buf[0] = uiop->uio_resid;
-	uiop->uio_rw = UIO_WRITE;
-	error = uiomove((caddr_t) &out->result, vmp->vm_outSize -
-	    (sizeof(int) * 2), uiop);
-	if (error) {
-		myprintf(("vcwrite: error (%d) on uiomove (op %ld seq %ld)\n",
-		    error, opcode, seq));
-		return (EINVAL);
-	}
-
-	/*
-	 * I don't think these are used, but just in case.
-	 *
-	 * XXX - aren't these two already correct? -bnoble
-	 */
-	out->opcode = opcode;
-	out->unique = seq;
-	vmp->vm_outSize	= buf[0];	/* Amount of data transferred? */
-	vmp->vm_flags |= VM_WRITE;
-	error = 0;
-	if (opcode == CODA_OPEN_BY_FD) {
-		struct coda_open_by_fd_out *tmp =
-		    (struct coda_open_by_fd_out *)out;
-		struct file *fp;
-		struct vnode *vp = NULL;
-
-		if (tmp->oh.result == 0) {
-			error = getvnode(uiop->uio_td->td_proc->p_fd, CAP_WRITE,
-			    tmp->fd, &fp);
-			if (!error) {
-				/*
-				 * XXX: Since the whole driver runs with
-				 * Giant, don't actually need to acquire it
-				 * explicitly here yet.
-				 */
-				mtx_lock(&Giant);
-				vp = fp->f_vnode;
-				VREF(vp);
-				fdrop(fp, uiop->uio_td);
-				mtx_unlock(&Giant);
-			}
-		}
-		tmp->vp = vp;
-	}
-	wakeup(&vmp->vm_sleep);
-	return (error);
-}
-
-int
-vc_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
-    struct thread *t)
-{
-
-	ENTRY;
-	switch(cmd) {
-	case CODARESIZE:
-		return (ENODEV);
-
-	case CODASTATS:
-		return (ENODEV);
-
-	case CODAPRINT:
-		return (ENODEV);
-
-	case CIOC_KERNEL_VERSION:
-		switch (*(u_int *)addr) {
-		case 0:
-			*(u_int *)addr = coda_kernel_version;
-			return (0);
-
-		case 1:
-		case 2:
-			if (coda_kernel_version != *(u_int *)addr)
-				return (ENOENT);
-			else
-			    	return (0);
-
-		default:
-			return (ENOENT);
-		}
-
-	default:
-		return (EINVAL);
-	}
-}
-
-int
-vc_poll(struct cdev *dev, int events, struct thread *td)
-{
-	struct vcomm *vcp;
-	int event_msk = 0;
-
-	ENTRY;
-	vcp = &dev2coda_mntinfo(dev)->mi_vcomm;
-	event_msk = events & (POLLIN|POLLRDNORM);
-	if (!event_msk)
-		return (0);
-	if (!TAILQ_EMPTY(&vcp->vc_requests))
-		return (events & (POLLIN|POLLRDNORM));
-	selrecord(td, &(vcp->vc_selproc));
-	return (0);
-}
-
-/*
- * Statistics.
- */
-struct coda_clstat coda_clstat;
-
-/*
- * Key question: whether to sleep interuptably or uninteruptably when waiting
- * for Venus.  The former seems better (cause you can ^C a job), but then
- * GNU-EMACS completion breaks.  Use tsleep with no timeout, and no longjmp
- * happens.  But, when sleeping "uninterruptibly", we don't get told if it
- * returns abnormally (e.g. kill -9).
- */
-int
-coda_call(struct coda_mntinfo *mntinfo, int inSize, int *outSize,
-    caddr_t buffer)
-{
-	struct vcomm *vcp;
-	struct vmsg *vmp;
-	int error;
-#ifdef CTL_C
-	struct thread *td = curthread;
-	struct proc *p = td->td_proc;
-	sigset_t psig_omask;
-	sigset_t tempset;
-	int i;
-#endif
-
-	/*
-	 * Unlikely, but could be a race condition with a dying warden.
-	 */
-	if (mntinfo == NULL)
-		return ENODEV;
-	vcp = &(mntinfo->mi_vcomm);
-	coda_clstat.ncalls++;
-	coda_clstat.reqs[((struct coda_in_hdr *)buffer)->opcode]++;
-	if (!VC_OPEN(vcp))
-		return (ENODEV);
-	CODA_ALLOC(vmp,struct vmsg *,sizeof(struct vmsg));
-
-	/*
-	 * Format the request message.
-	 */
-	vmp->vm_data = buffer;
-	vmp->vm_flags = 0;
-	vmp->vm_inSize = inSize;
-	vmp->vm_outSize
-	    = *outSize ? *outSize : inSize; /* |buffer| >= inSize */
-	vmp->vm_opcode = ((struct coda_in_hdr *)buffer)->opcode;
-	vmp->vm_unique = ++vcp->vc_seq;
-	if (codadebug)
-		myprintf(("Doing a call for %d.%d\n", vmp->vm_opcode,
-		    vmp->vm_unique));
-
-	/*
-	 * Fill in the common input args.
-	 */
-	((struct coda_in_hdr *)buffer)->unique = vmp->vm_unique;
-
-	/*
-	 * Append msg to request queue and poke Venus.
-	 */
-	TAILQ_INSERT_TAIL(&vcp->vc_requests, vmp, vm_chain);
-	selwakeuppri(&(vcp->vc_selproc), coda_call_sleep);
-
-	/*
-	 * We can be interrupted while we wait for Venus to process our
-	 * request.  If the interrupt occurs before Venus has read the
-	 * request, we dequeue and return. If it occurs after the read but
-	 * before the reply, we dequeue, send a signal message, and return.
-	 * If it occurs after the reply we ignore it.  In no case do we want
-	 * to restart the syscall.  If it was interrupted by a venus shutdown
-	 * (vcclose), return ENODEV.
-	 *
-	 * Ignore return, we have to check anyway.
-	 */
-#ifdef CTL_C
-	/*
-	 * This is work in progress.  Setting coda_pcatch lets tsleep
-	 * reawaken on a ^c or ^z.  The problem is that emacs sets certain
-	 * interrupts as SA_RESTART.  This means that we should exit sleep
-	 * handle the "signal" and then go to sleep again.  Mostly this is
-	 * done by letting the syscall complete and be restarted.  We are not
-	 * idempotent and can not do this.  A better solution is necessary.
-	 */
-	i = 0;
-	PROC_LOCK(p);
-	psig_omask = td->td_sigmask;
-	do {
-		error = msleep(&vmp->vm_sleep, &p->p_mtx,
-		    (coda_call_sleep|coda_pcatch), "coda_call", hz*2);
-		if (error == 0)
-			break;
-		else if (error == EWOULDBLOCK) {
-#ifdef CODA_VERBOSE
-			printf("coda_call: tsleep TIMEOUT %d sec\n", 2+2*i);
-#endif
-		}
-		else {
-			SIGEMPTYSET(tempset);
-			SIGADDSET(tempset, SIGIO);
-			if (SIGSETEQ(td->td_siglist, tempset)) {
-				SIGADDSET(td->td_sigmask, SIGIO);
-#ifdef CODA_VERBOSE
-				printf("coda_call: tsleep returns %d SIGIO, "
-				    "cnt %d\n", error, i);
-#endif
-			} else {
-				SIGDELSET(tempset, SIGIO);
-				SIGADDSET(tempset, SIGALRM);
-				if (SIGSETEQ(td->td_siglist, tempset)) {
-					SIGADDSET(td->td_sigmask, SIGALRM);
-#ifdef CODA_VERBOSE
-					printf("coda_call: tsleep returns "
-					    "%d SIGALRM, cnt %d\n", error, i);
-#endif
-				} else {
-#ifdef CODA_VERBOSE
-					printf("coda_call: tsleep returns "
-					    "%d, cnt %d\n", error, i);
-#endif
-
-#ifdef notyet
-					tempset = td->td_siglist;
-					SIGSETNAND(tempset, td->td_sigmask);
-					printf("coda_call: siglist = %p, "
-					    "sigmask = %p, mask %p\n",
-					    td->td_siglist, td->td_sigmask,
-					    tempset);
-					break;
-					SIGSETOR(td->td_sigmask, td->td_siglist);
-					tempset = td->td_siglist;
-					SIGSETNAND(tempset, td->td_sigmask);
-					printf("coda_call: new mask, "
-					    "siglist = %p, sigmask = %p, "
-					    "mask %p\n", td->td_siglist,
-					    td->td_sigmask, tempset);
-#endif
-				}
-			}
-		}
-	} while (error && i++ < 128 && VC_OPEN(vcp));
-	td->td_sigmask = psig_omask;
-	signotify(td);
-	PROC_UNLOCK(p);
-#else
-	(void)tsleep(&vmp->vm_sleep, coda_call_sleep, "coda_call", 0);
-#endif
-	if (VC_OPEN(vcp)) {
-		/*
-		 * Venus is still alive.
-		 *
-		 * Op went through, interrupt or not...
-		 */
-		if (vmp->vm_flags & VM_WRITE) {
-			error = 0;
-			*outSize = vmp->vm_outSize;
-		} else if (!(vmp->vm_flags & VM_READ)) {
-			/* Interrupted before venus read it. */
-#ifdef CODA_VERBOSE
-			if (1)
-#else
-			if (codadebug)
-#endif
-				myprintf(("interrupted before read: op = "
-				    "%d.%d, flags = %x\n", vmp->vm_opcode,
-				    vmp->vm_unique, vmp->vm_flags));
-			TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
-			error = EINTR;
-		} else {
-			/*
-			 * (!(vmp->vm_flags & VM_WRITE)) means interrupted
-			 * after upcall started.
-			 *
-			 * Interrupted after start of upcall, send venus a
-			 * signal.
-			 */
-			struct coda_in_hdr *dog;
-			struct vmsg *svmp;
-
-#ifdef CODA_VERBOSE
-			if (1)
-#else
-			if (codadebug)
-#endif
-				myprintf(("Sending Venus a signal: op = "
-				    "%d.%d, flags = %x\n", vmp->vm_opcode,
-				    vmp->vm_unique, vmp->vm_flags));
-			TAILQ_REMOVE(&vcp->vc_requests, vmp, vm_chain);
-			error = EINTR;
-			CODA_ALLOC(svmp, struct vmsg *, sizeof(struct vmsg));
-			CODA_ALLOC((svmp->vm_data), char *,
-			    sizeof(struct coda_in_hdr));
-			dog = (struct coda_in_hdr *)svmp->vm_data;
-			svmp->vm_flags = 0;
-			dog->opcode = svmp->vm_opcode = CODA_SIGNAL;
-			dog->unique = svmp->vm_unique = vmp->vm_unique;
-			svmp->vm_inSize = sizeof (struct coda_in_hdr);
-/*??? rvb */		svmp->vm_outSize = sizeof (struct coda_in_hdr);
-			if (codadebug)
-				myprintf(("coda_call: enqueing signal msg "
-				    "(%d, %d)\n", svmp->vm_opcode,
-				    svmp->vm_unique));
-
-			/*
-			 * Insert at head of queue!
-			 *
-			 * XXXRW: Actually, the tail.
-			 */
-			TAILQ_INSERT_TAIL(&vcp->vc_requests, svmp, vm_chain);
-			selwakeuppri(&(vcp->vc_selproc), coda_call_sleep);
-		}
-	} else {
-		/* If venus died (!VC_OPEN(vcp)) */
-		if (codadebug)
-			myprintf(("vcclose woke op %d.%d flags %d\n",
-			    vmp->vm_opcode, vmp->vm_unique, vmp->vm_flags));
-		error = ENODEV;
-	}
-	CODA_FREE(vmp, sizeof(struct vmsg));
-	if (outstanding_upcalls > 0 && (--outstanding_upcalls == 0))
-		wakeup(&outstanding_upcalls);
-	if (!error)
-		error = ((struct coda_out_hdr *)buffer)->result;
-	return (error);
-}
diff --git a/sys/fs/coda/coda_psdev.h b/sys/fs/coda/coda_psdev.h
deleted file mode 100644
index 021456b..0000000
--- a/sys/fs/coda/coda_psdev.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- */
-
-#ifndef _CODA_PSDEV_H_
-#define	_CODA_PSDEV_H_
-
-/*
- * Prototypes for cfs device operations.
- */
-d_open_t	vc_open;
-d_close_t	vc_close;
-d_read_t	vc_read;
-d_write_t	vc_write;
-d_ioctl_t	vc_ioctl;
-d_poll_t	vc_poll;
-
-#endif /* !_CODA_PSDEV_H_ */
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
deleted file mode 100644
index a7ae354..0000000
--- a/sys/fs/coda/coda_subr.c
+++ /dev/null
@@ -1,628 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-
-/*-
- * Mach Operating System
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon
- * University.  Contributers include David Steere, James Kistler, and
- * M. Satyanarayanan.
- */
-
-/*-
- * NOTES: rvb
- * 1.	Added coda_unmounting to mark all cnodes as being UNMOUNTING.  This
- *	has to be done before dounmount is called.  Because some of the
- *	routines that dounmount calls before coda_unmounted might try to
- *	force flushes to venus.  The vnode pager does this.
- * 2.	coda_unmounting marks all cnodes scanning coda_cache.
- * 3.	cfs_checkunmounting (under DEBUG) checks all cnodes by chasing the
- *	vnodes under the /coda mount point.
- * 4.	coda_cacheprint (under DEBUG) prints names with vnode/cnode address.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/mount.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_subr.h>
-
-static int coda_active = 0;
-static int coda_reuse = 0;
-static int coda_new = 0;
-
-static struct cnode *coda_freelist = NULL;
-static struct cnode *coda_cache[CODA_CACHESIZE];
-
-#define	CNODE_NEXT(cp)	((cp)->c_next)
-
-#ifdef CODA_COMPAT_5
-#define	coda_hash(fid)	(((fid)->Volume + (fid)->Vnode) & (CODA_CACHESIZE-1))
-#define	IS_DIR(cnode)	(cnode.Vnode & 0x1)
-#else
-#define	coda_hash(fid)	(coda_f2i(fid) & (CODA_CACHESIZE-1))
-#define	IS_DIR(cnode)	(cnode.opaque[2] & 0x1)
-#endif
-
-/*
- * Allocate a cnode.
- */
-struct cnode *
-coda_alloc(void)
-{
-	struct cnode *cp;
-
-	if (coda_freelist != NULL) {
-		cp = coda_freelist;
-		coda_freelist = CNODE_NEXT(cp);
-		coda_reuse++;
-	} else {
-		CODA_ALLOC(cp, struct cnode *, sizeof(struct cnode));
-
-		/*
-		 * FreeBSD vnodes don't have any Pager info in them ('cause
-		 * there are no external pagers, duh!).
-		 */
-#define	VNODE_VM_INFO_INIT(vp)         /* MT */
-		VNODE_VM_INFO_INIT(CTOV(cp));
-		coda_new++;
-	}
-	bzero(cp, sizeof (struct cnode));
-	return (cp);
-}
-
-/*
- * Deallocate a cnode.
- */
-void
-coda_free(struct cnode *cp)
-{
-
-	CNODE_NEXT(cp) = coda_freelist;
-	coda_freelist = cp;
-}
-
-/*
- * Put a cnode in the hash table.
- */
-void
-coda_save(struct cnode *cp)
-{
-
-	CNODE_NEXT(cp) = coda_cache[coda_hash(&cp->c_fid)];
-	coda_cache[coda_hash(&cp->c_fid)] = cp;
-}
-
-/*
- * Remove a cnode from the hash table.
- */
-void
-coda_unsave(struct cnode *cp)
-{
-	struct cnode *ptr;
-	struct cnode *ptrprev = NULL;
-
-	ptr = coda_cache[coda_hash(&cp->c_fid)];
-	while (ptr != NULL) {
-		if (ptr == cp) {
-			if (ptrprev == NULL)
-				coda_cache[coda_hash(&cp->c_fid)] =
-				    CNODE_NEXT(ptr);
-	    		else
-				CNODE_NEXT(ptrprev) = CNODE_NEXT(ptr);
-			CNODE_NEXT(cp) = (struct cnode *)NULL;
-			return;
-		}
-		ptrprev = ptr;
-		ptr = CNODE_NEXT(ptr);
-	}
-}
-
-/*
- * Lookup a cnode by fid. If the cnode is dying, it is bogus so skip it.
- *
- * NOTE: this allows multiple cnodes with same fid -- dcs 1/25/95
- */
-struct cnode *
-coda_find(struct CodaFid *fid)
-{
-	struct cnode *cp;
-
-	cp = coda_cache[coda_hash(fid)];
-	while (cp) {
-		if (coda_fid_eq(&(cp->c_fid), fid) && (!IS_UNMOUNTING(cp))) {
-			coda_active++;
-			return (cp);
-		}
-		cp = CNODE_NEXT(cp);
-	}
-	return (NULL);
-}
-
-/*
- * Clear all cached access control decisions from Coda.
- */
-static void
-coda_acccache_purge(struct mount *mnt)
-{
-	struct cnode *cp;
-	int hash;
-
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			if (CTOV(cp)->v_mount == mnt && VALID_ACCCACHE(cp)) {
-				CODADEBUG(CODA_FLUSH, myprintf(("acccache "
-				    "purge fid %s uid %d mode 0x%x\n",
-				    coda_f2s(&cp->c_fid), cp->c_cached_uid,
-				    (int)cp->c_cached_mode)););
-				cp->c_flags &= ~C_ACCCACHE;
-			}
-		}
-	}
-}
-
-/*
- * When a user loses their tokens (or other related events), we invalidate
- * any cached access rights in the access cache.  In the Linux version of
- * Coda, we maintain a global epoch and simply bump it to invalidate all
- * cached results generated in the epoch.  For now, we walk all cnodes and
- * manually invalidate just that uid in FreeBSD.
- */
-static void
-coda_acccache_purgeuser(struct mount *mnt, uid_t uid)
-{
-	struct cnode *cp;
-	int hash;
-
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			if (CTOV(cp)->v_mount == mnt &&
-			    VALID_ACCCACHE(cp) && (cp->c_cached_uid == uid)) {
-				CODADEBUG(CODA_PURGEUSER, myprintf((
-				    "acccache purgeuser fid %s uid %d mode "
-				    "0x%x\n", coda_f2s(&cp->c_fid),
-				    cp->c_cached_uid, (int)cp->c_cached_mode)););
-				cp->c_flags &= ~C_ACCCACHE;
-			}
-		}
-	}
-}
-
-/*
- * coda_kill is called as a side effect to vcopen.  To prevent any cnodes
- * left around from an earlier run of a venus or warden from causing problems
- * with the new instance, mark any outstanding cnodes as dying.  Future
- * operations on these cnodes should fail (excepting coda_inactive of
- * course!).  Since multiple venii/wardens can be running, only kill the
- * cnodes for a particular entry in the coda_mnttbl. -- DCS 12/1/94
- *
- * XXX: I don't believe any special behavior is required with respect to the
- * global namecache here, as /coda will have unmounted and hence cache_flush
- * will have run...?
- */
-int
-coda_kill(struct mount *whoIam, enum dc_status dcstat)
-{
-	int hash, count = 0;
-	struct cnode *cp;
-
-	/*-
-	 * Algorithm is as follows:
-	 *     Second, flush whatever vnodes we can from the name cache.
-	 *
-	 *     Finally, step through whatever is left and mark them dying.
-	 *        This prevents any operation at all.
-	 *
-	 * This is slightly overkill, but should work.  Eventually it'd be
-	 * nice to only flush those entries from the namecache that reference
-	 * a vnode in this vfs.
-	 *
-	 * XXXRW: Perhaps we no longer need to purge the name cache when
-	 * using the VFS name cache, as unmount will do that.
-	 */
-	cache_purgevfs(whoIam);
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash];cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			if (CTOV(cp)->v_mount == whoIam) {
-#ifdef DEBUG
-				printf("coda_kill: vp %p, cp %p\n", CTOV(cp),
-				    cp);
-#endif
-				count++;
-				CODADEBUG(CODA_FLUSH, myprintf(("Live cnode "
-				    "fid %s flags %d count %d\n",
-				    coda_f2s(&cp->c_fid), cp->c_flags,
-				    vrefcnt(CTOV(cp)))););
-			}
-		}
-	}
-	return (count);
-}
-
-/*
- * There are two reasons why a cnode may be in use, it may be in the name
- * cache or it may be executing.
- */
-void
-coda_flush(struct coda_mntinfo *mnt, enum dc_status dcstat)
-{
-	int hash;
-	struct cnode *cp;
-
-	coda_clstat.ncalls++;
-	coda_clstat.reqs[CODA_FLUSH]++;
-
-	coda_acccache_purge(mnt->mi_vfsp);
-	cache_purgevfs(mnt->mi_vfsp);
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			/*
-			 * Only files that can be executed need to be flushed
-			 * from the VM.
-			 *
-			 * NOTE: Currently this doesn't do anything, but
-			 * perhaps it should?
-			 */
-			if (!IS_DIR(cp->c_fid))
-				coda_vmflush(cp);
-		}
-	}
-}
-
-/*
- * As a debugging measure, print out any cnodes that lived through a name
- * cache flush.
- */
-void
-coda_testflush(void)
-{
-	int hash;
-	struct cnode *cp;
-
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp))
-			myprintf(("Live cnode fid %s count %d\n",
-			    coda_f2s(&cp->c_fid), CTOV(cp)->v_usecount));
-	}
-}
-
-/*
- * First, step through all cnodes and mark them unmounting.  FreeBSD kernels
- * may try to fsync them now that venus is dead, which would be a bad thing.
- */
-void
-coda_unmounting(struct mount *whoIam)
-{
-	int hash;
-	struct cnode *cp;
-
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			if (CTOV(cp)->v_mount == whoIam) {
-				if (cp->c_flags & (C_LOCKED|C_WANTED)) {
-					printf("coda_unmounting: Unlocking "
-					    "%p\n", cp);
-					cp->c_flags &= ~(C_LOCKED|C_WANTED);
-					wakeup((caddr_t) cp);
-				}
-				cp->c_flags |= C_UNMOUNTING;
-			}
-		}
-	}
-}
-
-#ifdef DEBUG
-void
-coda_checkunmounting(struct mount *mp)
-{
-	struct vnode *vp, *nvp;
-	struct cnode *cp;
-	int count = 0, bad = 0;
-
-	MNT_VNODE_FOREACH_ALL(vp, mp, nvp) {
-		cp = VTOC(vp);
-		count++;
-		if (!(cp->c_flags & C_UNMOUNTING)) {
-			bad++;
-			printf("vp %p, cp %p missed\n", vp, cp);
-			cp->c_flags |= C_UNMOUNTING;
-		}
-		VI_UNLOCK(vp);
-	}
-}
-
-void
-coda_cacheprint(struct mount *whoIam)
-{
-	int hash;
-	struct cnode *cp;
-	int count = 0;
-
-	printf("coda_cacheprint: coda_ctlvp %p, cp %p", coda_ctlvp,
-	    VTOC(coda_ctlvp));
-
-#if 0
-	coda_nc_name(VTOC(coda_ctlvp));
-#endif
-	printf("\n");
-	for (hash = 0; hash < CODA_CACHESIZE; hash++) {
-		for (cp = coda_cache[hash]; cp != NULL;
-		    cp = CNODE_NEXT(cp)) {
-			if (CTOV(cp)->v_mount == whoIam) {
-				printf("coda_cacheprint: vp %p, cp %p",
-				    CTOV(cp), cp);
-#if 0
-				coda_nc_name(cp);
-#endif
-				printf("\n");
-				count++;
-			}
-		}
-	}
-	printf("coda_cacheprint: count %d\n", count);
-}
-#endif
-
-/*-
- * There are 6 cases where invalidations occur.  The semantics of each is
- * listed here:
- *
- * CODA_FLUSH     -- Flush all entries from the name cache and the cnode
- *                   cache.
- *
- * CODA_PURGEUSER -- Flush all entries from the name cache for a specific
- *                   user.   This call is a result of token expiration.
- *
- * The next two are the result of callbacks on a file or directory:
- *
- * CODA_ZAPDIR    -- Flush the attributes for the dir from its cnode.  Zap
- *                   all children of this directory from the namecache.
- *
- * CODA_ZAPFILE   -- Flush the attributes for a file.
- *
- * The fifth is a result of Venus detecting an inconsistent file:
- *
- * CODA_PURGEFID  -- Flush the attribute for the file; if it is a dir (odd
- *                   vnode), purge its children from the namecache; remove
- *                   the file from the namecache.
- *
- * The sixth allows Venus to replace local fids with global ones during
- * reintegration.
- *
- * CODA_REPLACE   -- Replace one CodaFid with another throughout the name
- *                   cache.
- */
-int
-handleDownCall(struct coda_mntinfo *mnt, int opcode, union outputArgs *out)
-{
-	int error;
-
-	/*
-	 * Handle invalidate requests.
-	 */
-	switch (opcode) {
-	case CODA_FLUSH: {
-		coda_flush(mnt, IS_DOWNCALL);
-
-		/* Print any remaining cnodes. */
-		CODADEBUG(CODA_FLUSH, coda_testflush(););
-		return (0);
-	}
-
-	case CODA_PURGEUSER: {
-		coda_clstat.ncalls++;
-		coda_clstat.reqs[CODA_PURGEUSER]++;
-
-		/* XXX - need to prevent fsync's. */
-
-		/*
-		 * Purge any access cache entries for the uid.
-		 */
-#ifdef CODA_COMPAT_5
-	  	coda_acccache_purgeuser(mnt->mi_vfsp,
-		    out->coda_purgeuser.cred.cr_uid);
-#else
-		coda_acccache_purgeuser(mnt->mi_vfsp,
-		    out->coda_purgeuser.uid);
-#endif
-		return (0);
-	}
-
-	case CODA_ZAPFILE: {
-		struct cnode *cp;
-
-		error = 0;
-		coda_clstat.ncalls++;
-		coda_clstat.reqs[CODA_ZAPFILE]++;
-		cp = coda_find(&out->coda_zapfile.Fid);
-		if (cp != NULL) {
-			vref(CTOV(cp));
-			cache_purge(CTOV(cp));
-			cp->c_flags &= ~(C_VATTR | C_ACCCACHE);
-			ASSERT_VOP_LOCKED(CTOV(cp), "coda HandleDownCall");
-			if (VOP_IS_TEXT(CTOV(cp)))
-				error = coda_vmflush(cp);
-			CODADEBUG(CODA_ZAPFILE,
-			myprintf(("zapfile: fid = %s, refcnt = %d, error = "
-			    "%d\n", coda_f2s(&cp->c_fid),
-			    CTOV(cp)->v_usecount - 1, error)););
-			if (vrefcnt(CTOV(cp)) == 1)
-				cp->c_flags |= C_PURGING;
-			vrele(CTOV(cp));
-		}
-		return (error);
-      }
-
-      case CODA_ZAPDIR: {
-		struct cnode *cp;
-
-		coda_clstat.ncalls++;
-		coda_clstat.reqs[CODA_ZAPDIR]++;
-		cp = coda_find(&out->coda_zapdir.Fid);
-		if (cp != NULL) {
-			vref(CTOV(cp));
-			cache_purge(CTOV(cp));
-			cp->c_flags &= ~(C_VATTR | C_ACCCACHE);
-			CODADEBUG(CODA_ZAPDIR, myprintf(("zapdir: fid = %s, "
-			    "refcnt = %d\n", coda_f2s(&cp->c_fid),
-			    CTOV(cp)->v_usecount - 1)););
-			if (vrefcnt(CTOV(cp)) == 1)
-				cp->c_flags |= C_PURGING;
-			vrele(CTOV(cp));
-		}
-		return (0);
-      }
-
-      case CODA_PURGEFID: {
-		struct cnode *cp;
-
-		error = 0;
-		coda_clstat.ncalls++;
-		coda_clstat.reqs[CODA_PURGEFID]++;
-		cp = coda_find(&out->coda_purgefid.Fid);
-		if (cp != NULL) {
-			vref(CTOV(cp));
-			cache_purge(CTOV(cp));
-			cp->c_flags &= ~(C_VATTR | C_ACCCACHE);
-			ASSERT_VOP_LOCKED(CTOV(cp), "coda HandleDownCall");
-			if (!(IS_DIR(out->coda_purgefid.Fid))
-			    && VOP_IS_TEXT(CTOV(cp)))
-				error = coda_vmflush(cp);
-			CODADEBUG(CODA_PURGEFID, myprintf(("purgefid: fid "
-			    "= %s, refcnt = %d, error = %d\n",
-			    coda_f2s(&cp->c_fid),
-			    CTOV(cp)->v_usecount - 1, error)););
-			if (vrefcnt(CTOV(cp)) == 1)
-				cp->c_flags |= C_PURGING;
-			vrele(CTOV(cp));
-		}
-		return (error);
-	}
-
-	case CODA_REPLACE: {
-		struct cnode *cp = NULL;
-
-		coda_clstat.ncalls++;
-		coda_clstat.reqs[CODA_REPLACE]++;
-		cp = coda_find(&out->coda_replace.OldFid);
-		if (cp != NULL) {
-			/*
-			 * Remove the cnode from the hash table, replace the
-			 * fid, and reinsert.  Clear the attribute cache as
-			 * the "inode number" may have changed (it's just a
-			 * hash of the fid, and the fid is changing).
-			 */
-			vref(CTOV(cp));
-			coda_unsave(cp);
-			cp->c_fid = out->coda_replace.NewFid;
-			cp->c_flags &= ~C_VATTR;
-			coda_save(cp);
-			CODADEBUG(CODA_REPLACE, myprintf(("replace: oldfid "
-			    "= %s, newfid = %s, cp = %p\n",
-			    coda_f2s(&out->coda_replace.OldFid),
-			    coda_f2s(&cp->c_fid), cp)););
-			vrele(CTOV(cp));
-	  	}
-		return (0);
-	}
-	default:
-		myprintf(("handleDownCall: unknown opcode %d\n", opcode));
-		return (EINVAL);
-	}
-}
-
-int
-coda_vmflush(struct cnode *cp)
-{
-
-	return (0);
-}
-
-/*
- * Kernel-internal debugging switches.
- */
-void
-coda_debugon(void)
-{
-
-	codadebug = -1;
-	coda_vnop_print_entry = 1;
-	coda_psdev_print_entry = 1;
-	coda_vfsop_print_entry = 1;
-}
-
-void
-coda_debugoff(void)
-{
-
-	codadebug = 0;
-	coda_vnop_print_entry = 0;
-	coda_psdev_print_entry = 0;
-	coda_vfsop_print_entry = 0;
-}
-
-/*-
- * Utilities used by both client and server
- * Standard levels:
- * 0) no debugging
- * 1) hard failures
- * 2) soft failures
- * 3) current test software
- * 4) main procedure entry points
- * 5) main procedure exit points
- * 6) utility procedure entry points
- * 7) utility procedure exit points
- * 8) obscure procedure entry points
- * 9) obscure procedure exit points
- * 10) random stuff
- * 11) all <= 1
- * 12) all <= 2
- * 13) all <= 3
- * ...
- */
diff --git a/sys/fs/coda/coda_subr.h b/sys/fs/coda/coda_subr.h
deleted file mode 100644
index b8edfd3..0000000
--- a/sys/fs/coda/coda_subr.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- */
-
-#ifndef _CODA_SUBR_H_
-#define	_CODA_SUBR_H_
-
-struct cnode	*coda_alloc(void);
-void		 coda_free(struct cnode *cp);
-struct cnode	*coda_find(struct CodaFid *fid);
-void		 coda_flush(struct coda_mntinfo *mnt, enum dc_status dcstat);
-void		 coda_testflush(void);
-void		 coda_checkunmounting(struct mount *mp);
-void		 coda_cacheprint(struct mount *whoIam);
-void		 coda_debugon(void);
-void		 coda_debugoff(void);
-int		 coda_kill(struct mount *whoIam, enum dc_status dcstat);
-void		 coda_save(struct cnode *cp);
-void		 coda_unsave(struct cnode *cp);
-
-#endif /* !_CODA_SUBR_H_ */
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
deleted file mode 100644
index 9d012dd..0000000
--- a/sys/fs/coda/coda_venus.c
+++ /dev/null
@@ -1,705 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/fcntl.h>
-#include <sys/ioccom.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/proc.h>
-#include <sys/sx.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_venus.h>
-#include <fs/coda/coda_pioctl.h>
-
-#define	DECL_NO_IN(name)						\
-	struct coda_in_hdr *inp;					\
-	struct name ## _out *outp;					\
-	int name ## _size = sizeof (struct coda_in_hdr);		\
-	int Isize = sizeof (struct coda_in_hdr);			\
-	int Osize = sizeof (struct name ## _out);			\
-	int error
-
-#define	DECL(name)							\
-	struct name ## _in *inp;					\
-	struct name ## _out *outp;					\
-	int name ## _size = sizeof (struct name ## _in);		\
-	int Isize = sizeof (struct name ## _in);			\
-	int Osize = sizeof (struct name ## _out);			\
-	int error
-
-#define	DECL_NO_OUT(name)						\
-	struct name ## _in *inp;					\
-	struct coda_out_hdr *outp;					\
-	int name ## _size = sizeof (struct name ## _in);		\
-	int Isize = sizeof (struct name ## _in);			\
-	int Osize = sizeof (struct coda_out_hdr);			\
-	int error
-
-#define	ALLOC_NO_IN(name)						\
-	if (Osize > name ## _size)					\
-		name ## _size = Osize;					\
-	CODA_ALLOC(inp, struct coda_in_hdr *, name ## _size);		\
-	outp = (struct name ## _out *) inp
-
-#define	ALLOC(name)							\
-	if (Osize > name ## _size)					\
-		name ## _size = Osize;					\
-	CODA_ALLOC(inp, struct name ## _in *, name ## _size);		\
-	outp = (struct name ## _out *) inp
-
-#define	ALLOC_NO_OUT(name)						\
-	if (Osize > name ## _size)					\
-		name ## _size = Osize;					\
-	CODA_ALLOC(inp, struct name ## _in *, name ## _size);		\
-	outp = (struct coda_out_hdr *) inp
-
-#define	STRCPY(struc, name, len)					\
-	bcopy(name, (char *)inp + (int)inp->struc, len);		\
-	((char*)inp + (int)inp->struc)[len++] = 0;			\
-	Isize += len
-
-#ifdef CODA_COMPAT_5
-#define	INIT_IN(in, op, ident, p) do {					\
-	(in)->opcode = (op);						\
-	sx_slock(&proctree_lock);					\
-	(in)->pid = p ? p->p_pid : -1;					\
-	(in)->pgid = p ? p->p_pgid : -1;				\
-	(in)->sid = (p && p->p_session && p->p_session->s_leader) ?	\
-	    (p->p_session->s_leader->p_pid) : -1;			\
-	sx_sunlock(&proctree_lock);					\
-	if (ident != NOCRED) {						\
-		(in)->cred.cr_uid = ident->cr_uid;			\
-		(in)->cred.cr_groupid = ident->cr_gid;			\
-	} else {							\
-		bzero(&((in)->cred),sizeof(struct coda_cred));		\
-		(in)->cred.cr_uid = -1;					\
-		(in)->cred.cr_groupid = -1;				\
-	}								\
-} while (0)
-#else
-#define	INIT_IN(in, op, ident, p) do {					\
-	(in)->opcode = (op);						\
-	(in)->pid = p ? p->p_pid : -1;					\
-	(in)->pgid = p ? p->p_pgid : -1;				\
-	if (ident != NOCRED)						\
-		(in)->uid = ident->cr_uid;				\
-	else								\
-		(in)->uid = -1;						\
-} while (0)
-#endif
-
-#define	CNV_OFLAG(to, from) do { 					\
-	to = 0;								\
-	if (from & FREAD)   to |= C_O_READ; 				\
-	if (from & FWRITE)  to |= C_O_WRITE; 				\
-	if (from & O_TRUNC) to |= C_O_TRUNC; 				\
-	if (from & O_EXCL)  to |= C_O_EXCL; 				\
-	if (from & O_CREAT) to |= C_O_CREAT;				\
-} while (0)
-
-#define	CNV_VV2V_ATTR(top, fromp) do {					\
-	(top)->va_type = (fromp)->va_type;				\
-	(top)->va_mode = (fromp)->va_mode;				\
-	(top)->va_nlink = (fromp)->va_nlink;				\
-	(top)->va_uid = (fromp)->va_uid;				\
-	(top)->va_gid = (fromp)->va_gid;				\
-	(top)->va_fsid = VNOVAL;					\
-	(top)->va_fileid = (fromp)->va_fileid;				\
-	(top)->va_size = (fromp)->va_size;				\
-	(top)->va_blocksize = (fromp)->va_blocksize;			\
-	(top)->va_atime = (fromp)->va_atime;				\
-	(top)->va_mtime = (fromp)->va_mtime;				\
-	(top)->va_ctime = (fromp)->va_ctime;				\
-	(top)->va_gen = (fromp)->va_gen;				\
-	(top)->va_flags = (fromp)->va_flags;				\
-	(top)->va_rdev = (fromp)->va_rdev;				\
-	(top)->va_bytes = (fromp)->va_bytes;				\
-	(top)->va_filerev = (fromp)->va_filerev;			\
-	(top)->va_vaflags = VNOVAL;					\
-	(top)->va_spare = VNOVAL;					\
-} while (0)
-
-#define	CNV_V2VV_ATTR(top, fromp) do {					\
-	(top)->va_type = (fromp)->va_type;				\
-	(top)->va_mode = (fromp)->va_mode;				\
-	(top)->va_nlink = (fromp)->va_nlink;				\
-	(top)->va_uid = (fromp)->va_uid;				\
-	(top)->va_gid = (fromp)->va_gid;				\
-	(top)->va_fileid = (fromp)->va_fileid;				\
-	(top)->va_size = (fromp)->va_size;				\
-	(top)->va_blocksize = (fromp)->va_blocksize;			\
-	(top)->va_atime = (fromp)->va_atime;				\
-	(top)->va_mtime = (fromp)->va_mtime;				\
-	(top)->va_ctime = (fromp)->va_ctime;				\
-	(top)->va_gen = (fromp)->va_gen;				\
-	(top)->va_flags = (fromp)->va_flags;				\
-	(top)->va_rdev = (fromp)->va_rdev;				\
-	(top)->va_bytes = (fromp)->va_bytes;				\
-	(top)->va_filerev = (fromp)->va_filerev;			\
-} while (0)
-
-int coda_kernel_version = CODA_KERNEL_VERSION;
-
-int
-venus_root(void *mdp, struct ucred *cred, struct proc *p,
-    /*out*/ struct CodaFid *VFid)
-{
-	DECL_NO_IN(coda_root);		/* sets Isize & Osize */
-	ALLOC_NO_IN(coda_root);		/* sets inp & outp */
-
-	/* send the open to venus. */
-	INIT_IN(inp, CODA_ROOT, cred, p);
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error)
-		*VFid = outp->Fid;
-
-	CODA_FREE(inp, coda_root_size);
-	return (error);
-}
-
-int
-venus_open(void *mdp, struct CodaFid *fid, int flag, struct ucred *cred,
-    struct proc *p, /*out*/ struct vnode **vp)
-{
-	int cflag;
-	DECL(coda_open_by_fd);			/* sets Isize & Osize */
-	ALLOC(coda_open_by_fd);			/* sets inp & outp */
-
-	/* send the open to venus. */
-	INIT_IN(&inp->ih, CODA_OPEN_BY_FD, cred, p);
-	inp->Fid = *fid;
-	CNV_OFLAG(cflag, flag);
-	inp->flags = cflag;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	*vp = error ? NULL : outp->vp;
-
-	CODA_FREE(inp, coda_open_by_fd_size);
-	return (error);
-}
-
-int
-venus_close(void *mdp, struct CodaFid *fid, int flag, struct ucred *cred,
-    struct proc *p)
-{
-	int cflag;
-	DECL_NO_OUT(coda_close);		/* sets Isize & Osize */
-	ALLOC_NO_OUT(coda_close);		/* sets inp & outp */
-
-	INIT_IN(&inp->ih, CODA_CLOSE, cred, p);
-	inp->Fid = *fid;
-	CNV_OFLAG(cflag, flag);
-	inp->flags = cflag;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_close_size);
-	return (error);
-}
-
-/*
- * These two calls will not exist!!!  The container file is read/written
- * directly.
- */
-void
-venus_read(void)
-{
-}
-
-void
-venus_write(void)
-{
-}
-
-/*
- * This is a bit sad too.  the ioctl's are for the control file, not for
- * normal files.
- */
-int
-venus_ioctl(void *mdp, struct CodaFid *fid, int com, int flag, caddr_t data,
-    struct ucred *cred, struct proc *p)
-{
-	DECL(coda_ioctl);			/* sets Isize & Osize */
-	struct PioctlData *iap = (struct PioctlData *)data;
-	int tmp;
-
-	coda_ioctl_size = VC_MAXMSGSIZE;
-	ALLOC(coda_ioctl);			/* sets inp & outp */
-
-	INIT_IN(&inp->ih, CODA_IOCTL, cred, p);
-	inp->Fid = *fid;
-
-	/*
-	 * Command was mutated by increasing its size field to reflect the
-	 * path and follow args. we need to subtract that out before sending
-	 * the command to venus.
-	 */
-	inp->cmd = (com & ~(IOCPARM_MASK << 16));
-	tmp = ((com >> 16) & IOCPARM_MASK) - sizeof (char *) - sizeof (int);
-	inp->cmd |= (tmp & IOCPARM_MASK) << 16;
-
-	if (iap->vi.in_size > VC_MAXMSGSIZE ||
-	    iap->vi.out_size > VC_MAXMSGSIZE) {
-		CODA_FREE(inp, coda_ioctl_size);
-		return (EINVAL);
-	}
-
-	inp->rwflag = flag;
-	inp->len = iap->vi.in_size;
-	inp->data = (char *)(sizeof (struct coda_ioctl_in));
-
-	error = copyin(iap->vi.in, (char*)inp + (long)inp->data,
-	    iap->vi.in_size);
-	if (error) {
-		CODA_FREE(inp, coda_ioctl_size);
-		return (error);
-	}
-
-	Osize = VC_MAXMSGSIZE;
-	error = coda_call(mdp, Isize + iap->vi.in_size, &Osize, (char *)inp);
-
-	/*
-	 * Copy out the out buffer.
-	 */
-	if (!error) {
-		if (outp->len > iap->vi.out_size)
-			error = EINVAL;
-		else
-			error = copyout((char *)outp + (long)outp->data,
-			    iap->vi.out, iap->vi.out_size);
-	}
-
-	CODA_FREE(inp, coda_ioctl_size);
-	return (error);
-}
-
-int
-venus_getattr(void *mdp, struct CodaFid *fid, struct ucred *cred,
-    struct vattr *vap)
-{
-	struct proc *p;
-	DECL(coda_getattr);			/* sets Isize & Osize */
-	ALLOC(coda_getattr);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	p = curthread->td_proc;
-	INIT_IN(&inp->ih, CODA_GETATTR, cred, p);
-	inp->Fid = *fid;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error)
-		CNV_VV2V_ATTR(vap, &outp->attr);
-
-	CODA_FREE(inp, coda_getattr_size);
-	return (error);
-}
-
-int
-venus_setattr(void *mdp, struct CodaFid *fid, struct vattr *vap,
-    struct ucred *cred)
-{
-	struct proc *p;
-	DECL_NO_OUT(coda_setattr);		/* sets Isize & Osize */
-	ALLOC_NO_OUT(coda_setattr);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	p = curthread->td_proc;
-	INIT_IN(&inp->ih, CODA_SETATTR, cred, p);
-	inp->Fid = *fid;
-	CNV_V2VV_ATTR(&inp->attr, vap);
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_setattr_size);
-	return (error);
-}
-
-int
-venus_access(void *mdp, struct CodaFid *fid, accmode_t accmode,
-    struct ucred *cred, struct proc *p)
-{
-	DECL_NO_OUT(coda_access);		/* sets Isize & Osize */
-	ALLOC_NO_OUT(coda_access);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_ACCESS, cred, p);
-	inp->Fid = *fid;
-
-	/*
-	 * NOTE: FreeBSD and Venus internals use the "data" in the low 3
-	 * bits.  Hence, the conversion.
-	 *
-	 * XXX: We cast accmode_t variable into an int.
-	 */
-	inp->flags = (int)accmode>>6;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_access_size);
-	return (error);
-}
-
-int
-venus_readlink(void *mdp, struct CodaFid *fid, struct ucred *cred,
-    struct proc *p, /*out*/ char **str, int *len)
-{
-	DECL(coda_readlink);			/* sets Isize & Osize */
-	coda_readlink_size += CODA_MAXPATHLEN;
-	ALLOC(coda_readlink);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_READLINK, cred, p);
-	inp->Fid = *fid;
-
-	Osize += CODA_MAXPATHLEN;
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		CODA_ALLOC(*str, char *, outp->count);
-		*len = outp->count;
-		bcopy((char *)outp + (long)outp->data, *str, *len);
-	}
-
-	CODA_FREE(inp, coda_readlink_size);
-	return (error);
-}
-
-int
-venus_fsync(void *mdp, struct CodaFid *fid, struct proc *p)
-{
-	DECL_NO_OUT(coda_fsync);		/* sets Isize & Osize */
-	ALLOC_NO_OUT(coda_fsync);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 *
-	 * XXX: should be cached mount cred.
-	 */
-	INIT_IN(&inp->ih, CODA_FSYNC, NOCRED, p);
-	inp->Fid = *fid;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_fsync_size);
-	return (error);
-}
-
-int
-venus_lookup(void *mdp, struct CodaFid *fid, const char *nm, int len,
-    struct ucred *cred, struct proc *p, /*out*/	struct CodaFid *VFid,
-    int *vtype)
-{
-	DECL(coda_lookup);			/* sets Isize & Osize */
-	coda_lookup_size += len + 1;
-	ALLOC(coda_lookup);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_LOOKUP, cred, p);
-	inp->Fid = *fid;
-
-	/*
-	 * NOTE: Between version 1 and version 2 we have added an extra flag
-	 * field to this structure.  But because the string was at the end
-	 * and because of the wierd way we represent strings by having the
-	 * slot point to where the string characters are in the "heap", we
-	 * can just slip the flag parameter in after the string slot pointer
-	 * and veni that don't know better won't see this new flag field ...
-	 * Otherwise we'd need two different venus_lookup functions.
-	 */
-	inp->name = Isize;
-	inp->flags = CLU_CASE_SENSITIVE; /* doesn't really matter for BSD */
-	STRCPY(name, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		*VFid = outp->Fid;
-		*vtype = outp->vtype;
-	}
-
-	CODA_FREE(inp, coda_lookup_size);
-	return (error);
-}
-
-int
-venus_create(void *mdp, struct CodaFid *fid, const char *nm, int len,
-    int exclusive, int mode, struct vattr *va, struct ucred *cred,
-    struct proc *p, /*out*/ struct CodaFid *VFid, struct vattr *attr)
-{
-	DECL(coda_create);			/* sets Isize & Osize */
-	coda_create_size += len + 1;
-	ALLOC(coda_create);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_CREATE, cred, p);
-	inp->Fid = *fid;
-	inp->excl = exclusive ? C_O_EXCL : 0;
-	inp->mode = mode;
-	CNV_V2VV_ATTR(&inp->attr, va);
-
-	inp->name = Isize;
-	STRCPY(name, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		*VFid = outp->Fid;
-		CNV_VV2V_ATTR(attr, &outp->attr);
-	}
-
-	CODA_FREE(inp, coda_create_size);
-	return (error);
-}
-
-int
-venus_remove(void *mdp, struct CodaFid *fid, const char *nm, int len,
-    struct ucred *cred, struct proc *p)
-{
-	DECL_NO_OUT(coda_remove);		/* sets Isize & Osize */
-	coda_remove_size += len + 1;
-	ALLOC_NO_OUT(coda_remove);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_REMOVE, cred, p);
-	inp->Fid = *fid;
-
-	inp->name = Isize;
-	STRCPY(name, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_remove_size);
-	return (error);
-}
-
-int
-venus_link(void *mdp, struct CodaFid *fid, struct CodaFid *tfid,
-    const char *nm, int len, struct ucred *cred, struct proc *p)
-{
-	DECL_NO_OUT(coda_link);		/* sets Isize & Osize */
-	coda_link_size += len + 1;
-	ALLOC_NO_OUT(coda_link);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_LINK, cred, p);
-	inp->sourceFid = *fid;
-	inp->destFid = *tfid;
-
-	inp->tname = Isize;
-	STRCPY(tname, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_link_size);
-	return (error);
-}
-
-int
-venus_rename(void *mdp, struct CodaFid *fid, struct CodaFid *tfid,
-    const char *nm, int len, const char *tnm, int tlen, struct ucred *cred,
-    struct proc *p)
-{
-	DECL_NO_OUT(coda_rename);		/* sets Isize & Osize */
-	coda_rename_size += len + 1 + tlen + 1;
-	ALLOC_NO_OUT(coda_rename);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_RENAME, cred, p);
-	inp->sourceFid = *fid;
-	inp->destFid = *tfid;
-
-	inp->srcname = Isize;
-	STRCPY(srcname, nm, len);		/* increments Isize */
-
-	inp->destname = Isize;
-	STRCPY(destname, tnm, tlen);	/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_rename_size);
-	return (error);
-}
-
-int
-venus_mkdir(void *mdp, struct CodaFid *fid, const char *nm, int len,
-    struct vattr *va, struct ucred *cred, struct proc *p,
-    /*out*/ struct CodaFid *VFid, struct vattr *ova)
-{
-	DECL(coda_mkdir);			/* sets Isize & Osize */
-	coda_mkdir_size += len + 1;
-	ALLOC(coda_mkdir);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_MKDIR, cred, p);
-	inp->Fid = *fid;
-	CNV_V2VV_ATTR(&inp->attr, va);
-
-	inp->name = Isize;
-	STRCPY(name, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		*VFid = outp->Fid;
-		CNV_VV2V_ATTR(ova, &outp->attr);
-	}
-
-	CODA_FREE(inp, coda_mkdir_size);
-	return (error);
-}
-
-int
-venus_rmdir(void *mdp, struct CodaFid *fid, const char *nm, int len,
-    struct ucred *cred, struct proc *p)
-{
-	DECL_NO_OUT(coda_rmdir);		/* sets Isize & Osize */
-	coda_rmdir_size += len + 1;
-	ALLOC_NO_OUT(coda_rmdir);		/* sets inp & outp */
-
-	/*
-	 *  Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_RMDIR, cred, p);
-	inp->Fid = *fid;
-
-	inp->name = Isize;
-	STRCPY(name, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_rmdir_size);
-	return (error);
-}
-
-int
-venus_symlink(void *mdp, struct CodaFid *fid, const char *lnm, int llen,
-    const char *nm, int len, struct vattr *va, struct ucred *cred,
-    struct proc *p)
-{
-	DECL_NO_OUT(coda_symlink);		/* sets Isize & Osize */
-	coda_symlink_size += llen + 1 + len + 1;
-	ALLOC_NO_OUT(coda_symlink);		/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_SYMLINK, cred, p);
-	inp->Fid = *fid;
-	CNV_V2VV_ATTR(&inp->attr, va);
-
-	inp->srcname = Isize;
-	STRCPY(srcname, lnm, llen);		/* increments Isize */
-
-	inp->tname = Isize;
-	STRCPY(tname, nm, len);		/* increments Isize */
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-
-	CODA_FREE(inp, coda_symlink_size);
-	return (error);
-}
-
-/*
- * XXX: Unused.
- */
-int
-venus_readdir(void *mdp, struct CodaFid *fid, int count, int offset,
-    struct ucred *cred, struct proc *p, /*out*/	char *buffer, int *len)
-{
-	DECL(coda_readdir);			/* sets Isize & Osize */
-	coda_readdir_size = VC_MAXMSGSIZE;
-	ALLOC(coda_readdir);			/* sets inp & outp */
-
-	/*
-	 * Send the open to venus.
-	 */
-	INIT_IN(&inp->ih, CODA_READDIR, cred, p);
-	inp->Fid = *fid;
-	inp->count = count;
-	inp->offset = offset;
-
-	Osize = VC_MAXMSGSIZE;
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		bcopy((char *)outp + (long)outp->data, buffer, outp->size);
-		*len = outp->size;
-	}
-
-	CODA_FREE(inp, coda_readdir_size);
-	return (error);
-}
-
-int
-venus_fhtovp(void *mdp, struct CodaFid *fid, struct ucred *cred,
-    struct proc *p, /*out*/ struct CodaFid *VFid, int *vtype)
-{
-	DECL(coda_vget);			/* sets Isize & Osize */
-	ALLOC(coda_vget);			/* sets inp & outp */
-
-	/*
-	 * Send the open to Venus.
-	 */
-	INIT_IN(&inp->ih, CODA_VGET, cred, p);
-	inp->Fid = *fid;
-
-	error = coda_call(mdp, Isize, &Osize, (char *)inp);
-	if (!error) {
-		*VFid = outp->Fid;
-		*vtype = outp->vtype;
-	}
-
-	CODA_FREE(inp, coda_vget_size);
-	return (error);
-}
diff --git a/sys/fs/coda/coda_venus.h b/sys/fs/coda/coda_venus.h
deleted file mode 100644
index 95f1c57..0000000
--- a/sys/fs/coda/coda_venus.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- */
-
-#ifndef _CODA_VENUS_H_
-#define	_CODA_VENUS_H_
-
-int	venus_root(void *mdp, struct ucred *cred, struct proc *p,
-	    /*out*/ struct CodaFid *VFid);
-int	venus_open(void *mdp, struct CodaFid *fid, int flag,
-	    struct ucred *cred, struct proc *p, /*out*/ struct vnode **vp);
-int	venus_close(void *mdp, struct CodaFid *fid, int flag,
-	    struct ucred *cred, struct proc *p);
-void	venus_read(void);
-void	venus_write(void);
-int	venus_ioctl(void *mdp, struct CodaFid *fid, int com, int flag,
-	    caddr_t data, struct ucred *cred, struct proc *p);
-int	venus_getattr(void *mdp, struct CodaFid *fid, struct ucred *cred,
-	    struct vattr *vap);
-int	venus_setattr(void *mdp, struct CodaFid *fid, struct vattr *vap,
-	    struct ucred *cred);
-int	venus_access(void *mdp, struct CodaFid *fid, int mode,
-	    struct ucred *cred, struct proc *p);
-int	venus_readlink(void *mdp, struct CodaFid *fid, struct ucred *cred,
-	    struct proc *p, /*out*/ char **str, int *len);
-int	venus_fsync(void *mdp, struct CodaFid *fid, struct proc *p);
-int	venus_lookup(void *mdp, struct CodaFid *fid, const char *nm, int len,
-	    struct ucred *cred, struct proc *p, /*out*/ struct CodaFid *VFid,
-	    int *vtype);
-int	venus_create(void *mdp, struct CodaFid *fid, const char *nm, int len,
-	    int exclusive, int mode, struct vattr *va, struct ucred *cred,
-	    struct proc *p, /*out*/ struct CodaFid *VFid,
-	    struct vattr *attr);
-int	venus_remove(void *mdp, struct CodaFid *fid, const char *nm, int len,
-	    struct ucred *cred, struct proc *p);
-int	venus_link(void *mdp, struct CodaFid *fid, struct CodaFid *tfid,
-	    const char *nm, int len, struct ucred *cred, struct proc *p);
-int	venus_rename(void *mdp, struct CodaFid *fid, struct CodaFid *tfid,
-	    const char *nm, int len, const char *tnm, int tlen,
-	    struct ucred *cred, struct proc *p);
-int	venus_mkdir(void *mdp, struct CodaFid *fid, const char *nm, int len,
-	    struct vattr *va, struct ucred *cred, struct proc *p,
-	    /*out*/ struct CodaFid *VFid, struct vattr *ova);
-int	venus_rmdir(void *mdp, struct CodaFid *fid, const char *nm, int len,
-	    struct ucred *cred, struct proc *p);
-int	venus_symlink(void *mdp, struct CodaFid *fid, const char *lnm,
-	    int llen, const char *nm, int len, struct vattr *va,
-	    struct ucred *cred, struct proc *p);
-int	venus_readdir(void *mdp, struct CodaFid *fid, int count, int offset,
-	    struct ucred *cred, struct proc *p, /*out*/	char *buffer,
-	    int *len);
-int	venus_fhtovp(void *mdp, struct CodaFid *fid, struct ucred *cred,
-	    struct proc *p, /*out*/ struct CodaFid *VFid, int *vtype);
-
-#endif /* !_CODA_VENUS_H_ */
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
deleted file mode 100644
index 90660c6..0000000
--- a/sys/fs/coda/coda_vfsops.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- *  	@(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-
-/*-
- * Mach Operating System
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon
- * University.  Contributers include David Steere, James Kistler, and
- * M. Satyanarayanan.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_vfsops.h>
-#include <fs/coda/coda_venus.h>
-#include <fs/coda/coda_subr.h>
-#include <fs/coda/coda_opstats.h>
-
-MALLOC_DEFINE(M_CODA, "coda", "Various Coda Structures");
-
-int codadebug = 0;
-int coda_vfsop_print_entry = 0;
-#define	ENTRY do {							\
-	if (coda_vfsop_print_entry)					\
-		myprintf(("Entered %s\n", __func__));			\
-} while (0)
-
-struct vnode *coda_ctlvp;
-
-/*
- * Structure to keep statistics of internally generated/satisfied calls.
- */
-static struct coda_op_stats coda_vfsopstats[CODA_VFSOPS_SIZE];
-
-#define	MARK_ENTRY(op)		(coda_vfsopstats[op].entries++)
-#define	MARK_INT_SAT(op)	(coda_vfsopstats[op].sat_intrn++)
-#define	MARK_INT_FAIL(op)	(coda_vfsopstats[op].unsat_intrn++)
-#define	MARK_INT_GEN(op)	(coda_vfsopstats[op].gen_intrn++)
-
-int
-coda_vfsopstats_init(void)
-{
-	int i;
-
-	for (i=0; i<CODA_VFSOPS_SIZE;i++) {
-		coda_vfsopstats[i].opcode = i;
-		coda_vfsopstats[i].entries = 0;
-		coda_vfsopstats[i].sat_intrn = 0;
-		coda_vfsopstats[i].unsat_intrn = 0;
-		coda_vfsopstats[i].gen_intrn = 0;
-	}
-	return (0);
-}
-
-static const char *coda_opts[] = { "from", NULL };
-/*
- * cfs mount vfsop
- *
- * Set up mount info record and attach it to vfs struct.
- */
-/*ARGSUSED*/
-int
-coda_mount(struct mount *vfsp)
-{
-	struct vnode *dvp;
-	struct cnode *cp;
-	struct cdev *dev;
-	struct coda_mntinfo *mi;
-	struct vnode *rootvp;
-	struct CodaFid rootfid = INVAL_FID;
-	struct CodaFid ctlfid = CTL_FID;
-	int error;
-	struct nameidata ndp;
-	ENTRY;
-	char *from;
-
-	if (vfs_filteropt(vfsp->mnt_optnew, coda_opts))
-		return (EINVAL);
-	from = vfs_getopts(vfsp->mnt_optnew, "from", &error);
-	if (error)
-		return (error);
-	coda_vfsopstats_init();
-	coda_vnodeopstats_init();
-	MARK_ENTRY(CODA_MOUNT_STATS);
-	if (CODA_MOUNTED(vfsp)) {
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-		return (EBUSY);
-	}
-
-	/*
-	 * Validate mount device.  Similar to getmdev().
-	 */
-	NDINIT(&ndp, LOOKUP, FOLLOW, UIO_SYSSPACE, from, curthread);
-	error = namei(&ndp);
-	dvp = ndp.ni_vp;
-	if (error) {
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-		return (error);
-	}
-	if (dvp->v_type != VCHR) {
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-		vrele(dvp);
-		NDFREE(&ndp, NDF_ONLY_PNBUF);
-		return (ENXIO);
-	}
-	dev = dvp->v_rdev;
-	vrele(dvp);
-	NDFREE(&ndp, NDF_ONLY_PNBUF);
-
-	/*
-	 * Initialize the mount record and link it to the vfs struct.
-	 */
-	mi = dev2coda_mntinfo(dev);
-	if (!mi) {
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-		printf("Coda mount: %s is not a cfs device\n", from);
-		return (ENXIO);
-	}
-	if (!VC_OPEN(&mi->mi_vcomm)) {
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-		return (ENODEV);
-	}
-
-	/*
-	 * No initialization (here) of mi_vcomm!
-	 */
-	vfsp->mnt_data = mi;
-	vfs_getnewfsid (vfsp);
-	mi->mi_vfsp = vfsp;
-	mi->mi_started = 0;			/* XXX See coda_root() */
-
-	/*
-	 * Make a root vnode to placate the Vnode interface, but don't
-	 * actually make the CODA_ROOT call to venus until the first call to
-	 * coda_root in case a server is down while venus is starting.
-	 */
-	cp = make_coda_node(&rootfid, vfsp, VDIR);
-	rootvp = CTOV(cp);
-	rootvp->v_vflag |= VV_ROOT;
-	cp = make_coda_node(&ctlfid, vfsp, VREG);
-	coda_ctlvp = CTOV(cp);
-
-	/*
-	 * Add vfs and rootvp to chain of vfs hanging off mntinfo.
-	 */
-	mi->mi_vfsp = vfsp;
-	mi->mi_rootvp = rootvp;
-	vfs_mountedfrom(vfsp, from);
-
-	/*
-	 * Error is currently guaranteed to be zero, but in case some code
-	 * changes...
-	 */
-	CODADEBUG(1, myprintf(("coda_mount returned %d\n", error)););
-	if (error)
-		MARK_INT_FAIL(CODA_MOUNT_STATS);
-	else
-		MARK_INT_SAT(CODA_MOUNT_STATS);
-	return (error);
-}
-
-int
-coda_unmount(struct mount *vfsp, int mntflags)
-{
-	struct coda_mntinfo *mi = vftomi(vfsp);
-	int active, error = 0;
-
-	ENTRY;
-	MARK_ENTRY(CODA_UMOUNT_STATS);
-	if (!CODA_MOUNTED(vfsp)) {
-		MARK_INT_FAIL(CODA_UMOUNT_STATS);
-		return (EINVAL);
-	}
-	if (mi->mi_vfsp == vfsp) {
-		/*
-		 * We found the victim.
-		 */
-		if (!IS_UNMOUNTING(VTOC(mi->mi_rootvp)))
-			return (EBUSY); 	/* Venus is still running */
-#ifdef DEBUG
-		printf("coda_unmount: ROOT: vp %p, cp %p\n", mi->mi_rootvp,
-		    VTOC(mi->mi_rootvp));
-#endif
-		vrele(mi->mi_rootvp);
-		mi->mi_rootvp = NULL;
-		vrele(coda_ctlvp);
-		coda_ctlvp = NULL;
-		active = coda_kill(vfsp, NOT_DOWNCALL);
-		error = vflush(mi->mi_vfsp, 0, FORCECLOSE, curthread);
-#ifdef CODA_VERBOSE
-		printf("coda_unmount: active = %d, vflush active %d\n",
-		    active, error);
-#endif
-		error = 0;
-		/*
-		 * I'm going to take this out to allow lookups to go through.
-		 * I'm not sure it's important anyway. -- DCS 2/2/94
-		 */
-		/* vfsp->VFS_DATA = NULL; */
-
-		/*
-		 * No more vfsp's to hold onto.
-		 */
-		mi->mi_vfsp = NULL;
-
-		if (error)
-			MARK_INT_FAIL(CODA_UMOUNT_STATS);
-		else
-			MARK_INT_SAT(CODA_UMOUNT_STATS);
-		return (error);
-	}
-	return (EINVAL);
-}
-
-/*
- * Find root of cfs.
- */
-int
-coda_root(struct mount *vfsp, int flags, struct vnode **vpp)
-{
-	struct coda_mntinfo *mi = vftomi(vfsp);
-	int error;
-	struct proc *p;
-	struct thread *td;
-	struct CodaFid VFid;
-	static const struct CodaFid invalfid = INVAL_FID;
-
-	td = curthread;
-	p = td->td_proc;
-	ENTRY;
-	MARK_ENTRY(CODA_ROOT_STATS);
-	if (vfsp == mi->mi_vfsp) {
-		/*
-		 * Cache the root across calls.  We only need to pass the
-		 * request on to Venus if the root vnode is the dummy we
-		 * installed in coda_mount() with all c_fid members zeroed.
-		 *
-		 * XXX In addition, we assume that the first call to
-		 * coda_root() is from vfs_mount() (before the call to
-		 * checkdirs()) and return the dummy root node to avoid a
-		 * deadlock.  This bug is fixed in the Coda CVS repository
-		 * but not in any released versions as of 6 Mar 2003.
-		 */
-		if (memcmp(&VTOC(mi->mi_rootvp)->c_fid, &invalfid,
-		    sizeof(struct CodaFid)) != 0 || mi->mi_started == 0) {
-			/*
-			 * Found valid root.
-			 */
-			*vpp = mi->mi_rootvp;
-			mi->mi_started = 1;
-
-			/*
-			 * On Mach, this is vref.  On FreeBSD, vref +
-			 * vn_lock.
-			 */
-			vref(*vpp);
-			vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-			MARK_INT_SAT(CODA_ROOT_STATS);
-			return (0);
-		}
-	}
-
-	error = venus_root(vftomi(vfsp), td->td_ucred, p, &VFid);
-	if (!error) {
-		/*
-		 * Save the new rootfid in the cnode, and rehash the cnode
-		 * into the cnode hash with the new fid key.
-		 */
-		coda_unsave(VTOC(mi->mi_rootvp));
-		VTOC(mi->mi_rootvp)->c_fid = VFid;
-		coda_save(VTOC(mi->mi_rootvp));
-		*vpp = mi->mi_rootvp;
-		vref(*vpp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-		MARK_INT_SAT(CODA_ROOT_STATS);
-	} else if (error == ENODEV || error == EINTR) {
-		/*
-		 * Gross hack here!
-		 *
-		 * If Venus fails to respond to the CODA_ROOT call, coda_call
-		 * returns ENODEV. Return the uninitialized root vnode to
-		 * allow vfs operations such as unmount to continue.  Without
-		 * this hack, there is no way to do an unmount if Venus dies
-		 * before a successful CODA_ROOT call is done.  All vnode
-		 * operations will fail.
-		 */
-		*vpp = mi->mi_rootvp;
-		vref(*vpp);
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-		MARK_INT_FAIL(CODA_ROOT_STATS);
-		error = 0;
-	} else {
-		CODADEBUG(CODA_ROOT, myprintf(("error %d in CODA_ROOT\n",
-		    error)););
-		MARK_INT_FAIL(CODA_ROOT_STATS);
-	}
-	return (error);
-}
-
-/*
- * Get filesystem statistics.
- */
-int
-coda_statfs(struct mount *vfsp, struct statfs *sbp)
-{
-
-	ENTRY;
-	MARK_ENTRY(CODA_STATFS_STATS);
-	if (!CODA_MOUNTED(vfsp)) {
-		MARK_INT_FAIL(CODA_STATFS_STATS);
-		return (EINVAL);
-	}
-
-	/*
-	 * XXX - what to do about f_flags, others? --bnoble
-	 *
-	 * We just make up free space counts that are sufficiently large.
-	 */
-	sbp->f_flags = 0;
-	sbp->f_bsize = 8192; /* XXX */
-	sbp->f_iosize = 8192; /* XXX */
-#define	CODA_SFS_SIZ	0x8AB75D
-	sbp->f_blocks = CODA_SFS_SIZ;
-	sbp->f_bfree = CODA_SFS_SIZ;
-	sbp->f_bavail = CODA_SFS_SIZ;
-	sbp->f_files = CODA_SFS_SIZ;
-	sbp->f_ffree = CODA_SFS_SIZ;
-	MARK_INT_SAT(CODA_STATFS_STATS);
-	return (0);
-}
-
-/*
- * Flush any pending I/O.
- */
-int
-coda_sync(struct mount *vfsp, int waitfor)
-{
-
-	ENTRY;
-	MARK_ENTRY(CODA_SYNC_STATS);
-	MARK_INT_SAT(CODA_SYNC_STATS);
-	return (0);
-}
-
-/*
- * fhtovp is now what vget used to be in 4.3-derived systems.  For some silly
- * reason, vget is now keyed by a 32 bit ino_t, rather than a type-specific
- * fid.
- *
- * XXX: coda_fhtovp is currently not hooked up, so no NFS export for Coda.
- * We leave it here in the hopes that someone will find it someday and hook
- * it up.  Among other things, it will need some reworking to match the
- * vfs_fhtovp_t prototype.
- */
-int
-coda_fhtovp(struct mount *vfsp, struct fid *fhp, struct mbuf *nam,
-    struct vnode **vpp, int *exflagsp, struct ucred **creadanonp)
-{
-	struct cfid *cfid = (struct cfid *)fhp;
-	struct cnode *cp = NULL;
-	int error;
-	struct thread *td = curthread; /* XXX -mach */
-	struct proc *p = td->td_proc;
-	struct CodaFid VFid;
-	int vtype;
-
-	ENTRY;
-	MARK_ENTRY(CODA_VGET_STATS);
-
-	/*
-	 * Check for vget of control object.
-	 */
-	if (IS_CTL_FID(&cfid->cfid_fid)) {
-		*vpp = coda_ctlvp;
-		vref(coda_ctlvp);
-		MARK_INT_SAT(CODA_VGET_STATS);
-		return (0);
-	}
-	error = venus_fhtovp(vftomi(vfsp), &cfid->cfid_fid, td->td_ucred, p,
-	    &VFid, &vtype);
-	if (error) {
-		CODADEBUG(CODA_VGET, myprintf(("vget error %d\n",error)););
-		*vpp = NULL;
-	} else {
-		CODADEBUG(CODA_VGET, myprintf(("vget: %s type %d result "
-		    "%d\n", coda_f2s(&VFid), vtype, error)););
-		cp = make_coda_node(&VFid, vfsp, vtype);
-		*vpp = CTOV(cp);
-	}
-	return (error);
-}
-
-struct vfsops coda_vfsops = {
-	.vfs_mount =		coda_mount,
-	.vfs_root = 		coda_root,
-	.vfs_statfs =		coda_statfs,
-	.vfs_sync = 		coda_sync,
-	.vfs_unmount =		coda_unmount,
-};
-VFS_SET(coda_vfsops, coda, VFCF_NETWORK);
diff --git a/sys/fs/coda/coda_vfsops.h b/sys/fs/coda/coda_vfsops.h
deleted file mode 100644
index e5b3a11..0000000
--- a/sys/fs/coda/coda_vfsops.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/cfs/coda_vfsops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
- */
-
-#ifndef _CODA_VFSOPS_H_
-#define	_CODA_VFSOPS_H_
-
-/*
- * cfid structure:
- *
- * This overlays the fid structure (see vfs.h); only used below and will
- * probably go away.
- */
-struct cfid {
-	u_short	cfid_len;
-	u_short	padding;
-	struct CodaFid	cfid_fid;
-};
-
-struct mbuf;
-struct mount;
-int	coda_vfsopstats_init(void);
-int	coda_fhtovp(struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **);
-
-vfs_mount_t	coda_mount;
-vfs_unmount_t	coda_unmount;
-vfs_root_t	coda_root;
-vfs_statfs_t	coda_statfs;
-vfs_sync_t	coda_sync;
-
-#endif /* !_CODA_VFSOPS_H_ */
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
deleted file mode 100644
index 51fb307..0000000
--- a/sys/fs/coda/coda_vnops.c
+++ /dev/null
@@ -1,1738 +0,0 @@
-/*-
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- */
-/*
- * Mach Operating System
- * Copyright (c) 1990 Carnegie-Mellon University
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon
- * University.  Contributers include David Steere, James Kistler, and
- * M. Satyanarayanan.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/acct.h>
-#include <sys/errno.h>
-#include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/file.h>		/* Must come after sys/malloc.h */
-#include <sys/mount.h>
-#include <sys/mutex.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
-#include <sys/uio.h>
-#include <sys/unistd.h>
-
-#include <vm/vm.h>
-#include <vm/vm_object.h>
-#include <vm/vm_extern.h>
-
-#include <fs/coda/coda.h>
-#include <fs/coda/cnode.h>
-#include <fs/coda/coda_vnops.h>
-#include <fs/coda/coda_venus.h>
-#include <fs/coda/coda_opstats.h>
-#include <fs/coda/coda_subr.h>
-#include <fs/coda/coda_pioctl.h>
-
-/*
- * These flags select various performance enhancements.
- */
-static int coda_attr_cache = 1;		/* Set to cache attributes. */
-static int coda_symlink_cache = 1;	/* Set to cache symbolic links. */
-static int coda_access_cache = 1;	/* Set to cache some access checks. */
-
-/*
- * Structure to keep track of vfs calls.
- */
-static struct coda_op_stats coda_vnodeopstats[CODA_VNODEOPS_SIZE];
-
-#define	MARK_ENTRY(op)		(coda_vnodeopstats[op].entries++)
-#define	MARK_INT_SAT(op)	(coda_vnodeopstats[op].sat_intrn++)
-#define	MARK_INT_FAIL(op)	(coda_vnodeopstats[op].unsat_intrn++)
-#define	MARK_INT_GEN(op)	(coda_vnodeopstats[op].gen_intrn++)
-
-/*
- * What we are delaying for in printf.
- */
-int coda_printf_delay = 0;	/* In microseconds */
-int coda_vnop_print_entry = 0;
-static int coda_lockdebug = 0;
-
-/*
- * Some FreeBSD details:
- *
- * codadev_modevent is called at boot time or module load time.
- */
-#define	ENTRY do {							\
-	if (coda_vnop_print_entry)					\
-		myprintf(("Entered %s\n", __func__));			\
-} while (0)
-
-/*
- * Definition of the vnode operation vector.
- */
-struct vop_vector coda_vnodeops = {
-	.vop_default = &default_vnodeops,
-	.vop_cachedlookup = coda_lookup,	/* uncached lookup */
-	.vop_lookup = vfs_cache_lookup,		/* namecache lookup */
-	.vop_create = coda_create,		/* create */
-	.vop_open = coda_open,			/* open */
-	.vop_close = coda_close,		/* close */
-	.vop_access = coda_access,		/* access */
-	.vop_getattr = coda_getattr,		/* getattr */
-	.vop_setattr = coda_setattr,		/* setattr */
-	.vop_read = coda_read,			/* read */
-	.vop_write = coda_write,		/* write */
-	.vop_ioctl = coda_ioctl,		/* ioctl */
-	.vop_fsync = coda_fsync,		/* fsync */
-	.vop_remove = coda_remove,		/* remove */
-	.vop_link = coda_link,			/* link */
-	.vop_rename = coda_rename,		/* rename */
-	.vop_mkdir = coda_mkdir,		/* mkdir */
-	.vop_rmdir = coda_rmdir,		/* rmdir */
-	.vop_symlink = coda_symlink,		/* symlink */
-	.vop_readdir = coda_readdir,		/* readdir */
-	.vop_readlink = coda_readlink,		/* readlink */
-	.vop_inactive = coda_inactive,		/* inactive */
-	.vop_reclaim = coda_reclaim,		/* reclaim */
-	.vop_lock1 = coda_lock,			/* lock */
-	.vop_unlock = coda_unlock,		/* unlock */
-	.vop_bmap = VOP_EOPNOTSUPP,		/* bmap */
-	.vop_print = VOP_NULL,			/* print */
-	.vop_islocked = coda_islocked,		/* islocked */
-	.vop_pathconf = coda_pathconf,		/* pathconf */
-	.vop_poll = vop_stdpoll,
-	.vop_getpages = vop_stdgetpages,	/* pager intf.*/
-	.vop_putpages = vop_stdputpages,	/* pager intf.*/
-	.vop_getwritemount = vop_stdgetwritemount,
-#if 0
-	/* missing */
-	.vop_cachedlookup = ufs_lookup,
-	.vop_whiteout =	ufs_whiteout,
-#endif
-
-};
-
-static void	coda_print_vattr(struct vattr *attr);
-
-int
-coda_vnodeopstats_init(void)
-{
-	int i;
-
-	for(i=0; i<CODA_VNODEOPS_SIZE; i++) {
-		coda_vnodeopstats[i].opcode = i;
-		coda_vnodeopstats[i].entries = 0;
-		coda_vnodeopstats[i].sat_intrn = 0;
-		coda_vnodeopstats[i].unsat_intrn = 0;
-		coda_vnodeopstats[i].gen_intrn = 0;
-	}
-	return (0);
-}
-
-/*
- * coda_open calls Venus which returns an open file descriptor the cache file
- * holding the data.  We get the vnode while we are still in the context of
- * the venus process in coda_psdev.c.  This vnode is then passed back to the
- * caller and opened.
- */
-int
-coda_open(struct vop_open_args *ap)
-{
-
-	/*
-	 * FreeBSD can pass the O_EXCL flag in mode, even though the check
-	 * has already happened.  Venus defensively assumes that if open is
-	 * passed the EXCL, it must be a bug.  We strip the flag here.
-	 */
-	/* true args */
-	struct vnode **vpp = &(ap->a_vp);
-	struct cnode *cp = VTOC(*vpp);
-	int flag = ap->a_mode & (~O_EXCL);
-	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_td;
-	/* locals */
-	int error;
-	struct vnode *vp;
-
-	MARK_ENTRY(CODA_OPEN_STATS);
-
-	/*
-	 * Check for open of control file.
-	 */
-	if (IS_CTL_VP(*vpp)) {
-		/* XXX */
-		/* if (WRITEABLE(flag)) */
-		if (flag & (FWRITE | O_TRUNC | O_CREAT | O_EXCL)) {
-			MARK_INT_FAIL(CODA_OPEN_STATS);
-			return (EACCES);
-		}
-		MARK_INT_SAT(CODA_OPEN_STATS);
-		return (0);
-	}
-	error = venus_open(vtomi((*vpp)), &cp->c_fid, flag, cred,
-	    td->td_proc, &vp);
-	if (error)
-		return (error);
-	CODADEBUG(CODA_OPEN, myprintf(("open: vp %p result %d\n", vp,
-	    error)););
-
-	/*
-	 * Save the vnode pointer for the cache file.
-	 */
-	if (cp->c_ovp == NULL) {
-		cp->c_ovp = vp;
-	} else {
-		if (cp->c_ovp != vp)
-			panic("coda_open: cp->c_ovp != ITOV(ip)");
-	}
-	cp->c_ocount++;
-
-	/*
-	 * Flush the attribute cached if writing the file.
-	 */
-	if (flag & FWRITE) {
-		cp->c_owrite++;
-		cp->c_flags &= ~C_VATTR;
-	}
-
-	/*
-	 * Open the cache file.
-	 */
-	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
-	error = VOP_OPEN(vp, flag, cred, td, NULL);
-	if (error) {
-		VOP_UNLOCK(vp, 0);
-    		printf("coda_open: VOP_OPEN on container failed %d\n", error);
-		return (error);
-	}
-	(*vpp)->v_object = vp->v_object;
-	VOP_UNLOCK(vp, 0);
-	return (0);
-}
-
-/*
- * Close the cache file used for I/O and notify Venus.
- */
-int
-coda_close(struct vop_close_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	int flag = ap->a_fflag;
-	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_td;
-	/* locals */
-	int error;
-
-	MARK_ENTRY(CODA_CLOSE_STATS);
-
-	/*
-	 * Check for close of control file.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_SAT(CODA_CLOSE_STATS);
-		return (0);
-	}
-	if (cp->c_ovp) {
-		vn_lock(cp->c_ovp, LK_EXCLUSIVE | LK_RETRY);
-		/* Do errors matter here? */
-		VOP_CLOSE(cp->c_ovp, flag, cred, td);
-		vput(cp->c_ovp);
-	}
-#ifdef CODA_VERBOSE
-	else
-		printf("coda_close: NO container vp %p/cp %p\n", vp, cp);
-#endif
-	if (--cp->c_ocount == 0)
-		cp->c_ovp = NULL;
-
-	/*
-	 * File was opened for write.
-	 */
-	if (flag & FWRITE)
-		--cp->c_owrite;
-	if (!IS_UNMOUNTING(cp))
-		error = venus_close(vtomi(vp), &cp->c_fid, flag, cred,
-		    td->td_proc);
-	else
-		error = ENODEV;
-	CODADEBUG(CODA_CLOSE, myprintf(("close: result %d\n",error)););
-	return (error);
-}
-
-int
-coda_read(struct vop_read_args *ap)
-{
-
-	ENTRY;
-	return (coda_rdwr(ap->a_vp, ap->a_uio, UIO_READ, ap->a_ioflag,
-	    ap->a_cred, ap->a_uio->uio_td));
-}
-
-int
-coda_write(struct vop_write_args *ap)
-{
-
-	ENTRY;
-	return (coda_rdwr(ap->a_vp, ap->a_uio, UIO_WRITE, ap->a_ioflag,
-	    ap->a_cred, ap->a_uio->uio_td));
-}
-
-int
-coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw, int ioflag,
-    struct ucred *cred, struct thread *td)
-{
-	/* upcall decl */
-	/* NOTE: container file operation!!! */
-	/* locals */
-	struct cnode *cp = VTOC(vp);
-	struct vnode *cfvp = cp->c_ovp;
-	int opened_internally = 0;
-	int error = 0;
-
-	MARK_ENTRY(CODA_RDWR_STATS);
-	CODADEBUG(CODA_RDWR, myprintf(("coda_rdwr(%d, %p, %zd, %lld, %d)\n",
-	    rw, (void *)uiop->uio_iov->iov_base, uiop->uio_resid,
-	    (long long)uiop->uio_offset, uiop->uio_segflg)););
-
-	/*
-	 * Check for rdwr of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_RDWR_STATS);
-		return (EINVAL);
-	}
-
-	/*
-	 * If file is not already open this must be a page {read,write}
-	 * request and we should open it internally.
-	 */
-	if (cfvp == NULL) {
-		opened_internally = 1;
-		MARK_INT_GEN(CODA_OPEN_STATS);
-		error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), cred,
-		    td, NULL);
-#ifdef CODA_VERBOSE
-		printf("coda_rdwr: Internally Opening %p\n", vp);
-#endif
-		if (error) {
-			printf("coda_rdwr: VOP_OPEN on container failed "
-			    "%d\n", error);
-			return (error);
-		}
-		cfvp = cp->c_ovp;
-	}
-
-	/*
-	 * Have UFS handle the call.
-	 */
-	CODADEBUG(CODA_RDWR, myprintf(("indirect rdwr: fid = %s, refcnt = "
-	    "%d\n", coda_f2s(&cp->c_fid), CTOV(cp)->v_usecount)););
-	vn_lock(cfvp, LK_EXCLUSIVE | LK_RETRY);
-	if (rw == UIO_READ) {
-		error = VOP_READ(cfvp, uiop, ioflag, cred);
-	} else {
-		error = VOP_WRITE(cfvp, uiop, ioflag, cred);
-		/*
-		 * ufs_write updates the vnode_pager_setsize for the
-		 * vnode/object.
-		 *
-		 * XXX: Since we now share vm objects between layers, this is
-		 * probably unnecessary.
-		 */
-		{
-			struct vattr attr;
-			if (VOP_GETATTR(cfvp, &attr, cred) == 0)
-				vnode_pager_setsize(vp, attr.va_size);
-		}
-	}
-	VOP_UNLOCK(cfvp, 0);
-	if (error)
-		MARK_INT_FAIL(CODA_RDWR_STATS);
-	else
-		MARK_INT_SAT(CODA_RDWR_STATS);
-
-	/*
-	 * Do an internal close if necessary.
-	 */
-	if (opened_internally) {
-		MARK_INT_GEN(CODA_CLOSE_STATS);
-		(void)VOP_CLOSE(vp, (rw == UIO_READ ? FREAD : FWRITE), cred,
-		    td);
-	}
-
-	/*
-	 * Invalidate cached attributes if writing.
-	 */
-	if (rw == UIO_WRITE)
-		cp->c_flags &= ~C_VATTR;
-	return (error);
-}
-
-int
-coda_ioctl(struct vop_ioctl_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	int com = ap->a_command;
-	caddr_t data = ap->a_data;
-	int flag = ap->a_fflag;
-	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_td;
-	/* locals */
-	int error;
-	struct vnode *tvp;
-	struct nameidata ndp;
-	struct PioctlData *iap = (struct PioctlData *)data;
-
-	MARK_ENTRY(CODA_IOCTL_STATS);
-	CODADEBUG(CODA_IOCTL, myprintf(("in coda_ioctl on %s\n", iap->path)););
-
-	/*
-	 * Don't check for operation on a dying object, for ctlvp it
-	 * shouldn't matter.
-	 *
-	 * Must be control object to succeed.
-	 */
-	if (!IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_IOCTL_STATS);
-		CODADEBUG(CODA_IOCTL, myprintf(("coda_ioctl error: vp != "
-		    "ctlvp")););
-		return (EOPNOTSUPP);
-	}
-
-	/*
-	 * Look up the pathname.
-	 *
-	 * Should we use the name cache here? It would get it from lookupname
-	 * sooner or later anyway, right?
-	 */
-	NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW),
-	    UIO_USERSPACE, iap->path, td);
-	error = namei(&ndp);
-	tvp = ndp.ni_vp;
-	if (error) {
-		MARK_INT_FAIL(CODA_IOCTL_STATS);
-		CODADEBUG(CODA_IOCTL, myprintf(("coda_ioctl error: lookup "
-		    "returns %d\n", error)););
-		return (error);
-	}
-
-	/*
-	 * Make sure this is a coda style cnode, but it may be a different
-	 * vfsp.
-	 */
-	if (tvp->v_op != &coda_vnodeops) {
-		vrele(tvp);
-		NDFREE(&ndp, NDF_ONLY_PNBUF);
-		MARK_INT_FAIL(CODA_IOCTL_STATS);
-		CODADEBUG(CODA_IOCTL,
-		myprintf(("coda_ioctl error: %s not a coda object\n",
-		    iap->path)););
-		return (EINVAL);
-	}
-	if (iap->vi.in_size > VC_MAXDATASIZE ||
-	    iap->vi.out_size > VC_MAXDATASIZE) {
-		NDFREE(&ndp, 0);
-		return (EINVAL);
-	}
-	error = venus_ioctl(vtomi(tvp), &((VTOC(tvp))->c_fid), com, flag,
-	    data, cred, td->td_proc);
-	if (error)
-		MARK_INT_FAIL(CODA_IOCTL_STATS);
-	else
-		CODADEBUG(CODA_IOCTL, myprintf(("Ioctl returns %d \n",
-		    error)););
-	vrele(tvp);
-	NDFREE(&ndp, NDF_ONLY_PNBUF);
-	return (error);
-}
-
-/*
- * To reduce the cost of a user-level venus;we cache attributes in the
- * kernel.  Each cnode has storage allocated for an attribute.  If c_vattr is
- * valid, return a reference to it.  Otherwise, get the attributes from venus
- * and store them in the cnode.  There is some question if this method is a
- * security leak.  But I think that in order to make this call, the user must
- * have done a lookup and opened the file, and therefore should already have
- * access.
- */
-int
-coda_getattr(struct vop_getattr_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct vattr *vap = ap->a_vap;
-	struct ucred *cred = ap->a_cred;
-	/* locals */
-    	struct vnode *convp;
-	int error, size;
-
-	MARK_ENTRY(CODA_GETATTR_STATS);
-	if (IS_UNMOUNTING(cp))
-		return (ENODEV);
-
-	/*
-	 * Check for getattr of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_GETATTR_STATS);
-		return (ENOENT);
-	}
-
-	/*
-	 * Check to see if the attributes have already been cached.
-	 */
-	if (VALID_VATTR(cp)) {
-		CODADEBUG(CODA_GETATTR, myprintf(("attr cache hit: %s\n",
-		    coda_f2s(&cp->c_fid))););
-		CODADEBUG(CODA_GETATTR, if (!(codadebug & ~CODA_GETATTR))
-		    coda_print_vattr(&cp->c_vattr););
-		*vap = cp->c_vattr;
-		MARK_INT_SAT(CODA_GETATTR_STATS);
-		return (0);
-	}
-    	error = venus_getattr(vtomi(vp), &cp->c_fid, cred, vap);
-	if (!error) {
-		CODADEBUG(CODA_GETATTR, myprintf(("getattr miss %s: result "
-		    "%d\n", coda_f2s(&cp->c_fid), error)););
-		CODADEBUG(CODA_GETATTR, if (!(codadebug & ~CODA_GETATTR))
-		    coda_print_vattr(vap););
-
-		/*
-		 * XXX: Since we now share vm objects between layers, this is
-		 * probably unnecessary.
-		 */
-		size = vap->va_size;
-    		convp = cp->c_ovp;
-		if (convp != NULL)
-			vnode_pager_setsize(convp, size);
-
-		/*
-		 * If not open for write, store attributes in cnode.
-		 */
-		if ((cp->c_owrite == 0) && (coda_attr_cache)) {
-			cp->c_vattr = *vap;
-			cp->c_flags |= C_VATTR;
-		}
-	}
-	return (error);
-}
-
-int
-coda_setattr(struct vop_setattr_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct vattr *vap = ap->a_vap;
-	struct ucred *cred = ap->a_cred;
-	/* locals */
-    	struct vnode *convp;
-	int error, size;
-
-	MARK_ENTRY(CODA_SETATTR_STATS);
-
-	/*
-	 * Check for setattr of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_SETATTR_STATS);
-		return (ENOENT);
-	}
-	if (codadebug & CODADBGMSK(CODA_SETATTR))
-		coda_print_vattr(vap);
-	error = venus_setattr(vtomi(vp), &cp->c_fid, vap, cred);
-	if (!error)
-		cp->c_flags &= ~(C_VATTR | C_ACCCACHE);
-
-	/*
-	 * XXX: Since we now share vm objects between layers, this is
-	 * probably unnecessary.
-	 *
-	 * XXX: Shouldn't we only be doing this "set" if C_VATTR remains
-	 * valid after venus_setattr()?
-	 */
-	size = vap->va_size;
-    	convp = cp->c_ovp;
-	if (size != VNOVAL && convp != NULL)
-		vnode_pager_setsize(convp, size);
-	CODADEBUG(CODA_SETATTR,	myprintf(("setattr %d\n", error)););
-	return (error);
-}
-
-int
-coda_access(struct vop_access_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	accmode_t accmode = ap->a_accmode;
-	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_td;
-	/* locals */
-	int error;
-
-	MARK_ENTRY(CODA_ACCESS_STATS);
-
-	/*
-	 * Check for access of control object.  Only read access is allowed
-	 * on it.
-	 */
-	if (IS_CTL_VP(vp)) {
-		/*
-		 * Bogus hack - all will be marked as successes.
-		 */
-		MARK_INT_SAT(CODA_ACCESS_STATS);
-		return (((accmode & VREAD) && !(accmode & (VWRITE | VEXEC)))
-		    ? 0 : EACCES);
-	}
-
-	/*
-	 * We maintain a one-entry LRU positive access cache with each cnode.
-	 * In principle we could also track negative results, and for more
-	 * than one uid, but we don't yet.  Venus is responsible for
-	 * invalidating this cache as required.
-	 */
-	if (coda_access_cache && VALID_ACCCACHE(cp) &&
-	    (cred->cr_uid == cp->c_cached_uid) &&
-	    (accmode & cp->c_cached_mode) == accmode) {
-		MARK_INT_SAT(CODA_ACCESS_STATS);
-		return (0);
-	}
-	error = venus_access(vtomi(vp), &cp->c_fid, accmode, cred, td->td_proc);
-	if (error == 0 && coda_access_cache) {
-		/*-
-		 * When we have a new successful request, we consider three
-		 * cases:
-		 *
-		 * - No initialized access cache, in which case cache the
-		 *   result.
-		 * - Cached result for a different user, in which case we
-		 *   replace the entry.
-		 * - Cached result for the same user, in which case we add
-		 *   any newly granted rights to the cached mode.
-		 *
-		 * XXXRW: If we ever move to something more interesting than
-		 * uid-based token lookup, we'll need to change this.
-		 */
-		cp->c_flags |= C_ACCCACHE;
-		if (cp->c_cached_uid != cred->cr_uid) {
-			cp->c_cached_mode = accmode;
-			cp->c_cached_uid = cred->cr_uid;
-		} else
-			cp->c_cached_mode |= accmode;
-	}
-	return (error);
-}
-
-int
-coda_readlink(struct vop_readlink_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct uio *uiop = ap->a_uio;
-	struct ucred *cred = ap->a_cred;
-	struct thread *td = ap->a_uio->uio_td;
-	/* locals */
-	int error;
-	char *str;
-	int len;
-
-	MARK_ENTRY(CODA_READLINK_STATS);
-
-	/*
-	 * Check for readlink of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_READLINK_STATS);
-		return (ENOENT);
-	}
-	if ((coda_symlink_cache) && (VALID_SYMLINK(cp))) {
-		/*
-		 * Symlink was cached.
-		 */
-		uiop->uio_rw = UIO_READ;
-		error = uiomove(cp->c_symlink, (int)cp->c_symlen, uiop);
-		if (error)
-			MARK_INT_FAIL(CODA_READLINK_STATS);
-		else
-			MARK_INT_SAT(CODA_READLINK_STATS);
-		return (error);
-	}
-	error = venus_readlink(vtomi(vp), &cp->c_fid, cred, td != NULL ?
-	    td->td_proc : NULL, &str, &len);
-	if (!error) {
-		uiop->uio_rw = UIO_READ;
-		error = uiomove(str, len, uiop);
-		if (coda_symlink_cache) {
-			cp->c_symlink = str;
-			cp->c_symlen = len;
-			cp->c_flags |= C_SYMLINK;
-		} else
-			CODA_FREE(str, len);
-	}
-	CODADEBUG(CODA_READLINK, myprintf(("in readlink result %d\n",
-	    error)););
-	return (error);
-}
-
-int
-coda_fsync(struct vop_fsync_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct thread *td = ap->a_td;
-	/* locals */
-	struct vnode *convp = cp->c_ovp;
-	int error;
-
-	MARK_ENTRY(CODA_FSYNC_STATS);
-
-	/*
-	 * Check for fsync on an unmounting object.
-	 *
-	 * XXX: Is this comment true on FreeBSD?  It seems likely, since
-	 * unmounting is fairly non-atomic.
-	 *
-	 * The NetBSD kernel, in it's infinite wisdom, can try to fsync after
-	 * an unmount has been initiated.  This is a Bad Thing, which we have
-	 * to avoid.  Not a legitimate failure for stats.
-	 */
-	if (IS_UNMOUNTING(cp))
-		return (ENODEV);
-
-	/*
-	 * Check for fsync of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_SAT(CODA_FSYNC_STATS);
-		return (0);
-	}
-	if (convp != NULL) {
-		vn_lock(convp, LK_EXCLUSIVE | LK_RETRY);
-		VOP_FSYNC(convp, MNT_WAIT, td);
-		VOP_UNLOCK(convp, 0);
-	}
-
-	/*
-	 * We see fsyncs with usecount == 1 then usecount == 0.  For now we
-	 * ignore them.
-	 */
-#if 0
-	VI_LOCK(vp);
-	if (!vp->v_usecount) {
-		printf("coda_fsync on vnode %p with %d usecount.  "
-		    "c_flags = %x (%x)\n", vp, vp->v_usecount, cp->c_flags,
-		    cp->c_flags&C_PURGING);
-	}
-	VI_UNLOCK(vp);
-#endif
-
-	/*
-	 * We can expect fsync on any vnode at all if venus is purging it.
-	 * Venus can't very well answer the fsync request, now can it?
-	 * Hopefully, it won't have to, because hopefully, venus preserves
-	 * the (possibly untrue) invariant that it never purges an open
-	 * vnode.  Hopefully.
-	 */
-	if (cp->c_flags & C_PURGING)
-		return (0);
-
-	/* XXX: needs research */
-	return (0);
-	error = venus_fsync(vtomi(vp), &cp->c_fid, td->td_proc);
-	CODADEBUG(CODA_FSYNC, myprintf(("in fsync result %d\n", error)););
-	return (error);
-}
-
-int
-coda_inactive(struct vop_inactive_args *ap)
-{
-	/*
-	 * XXX - at the moment, inactive doesn't look at cred, and doesn't
-	 * have a proc pointer.  Oops.
-	 */
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct ucred *cred __attribute__((unused)) = NULL;
-	struct thread *td __attribute__((unused)) = curthread;
-	/* upcall decl */
-	/* locals */
-
-	/*
-	 * We don't need to send inactive to venus - DCS.
-	 */
-	MARK_ENTRY(CODA_INACTIVE_STATS);
-	CODADEBUG(CODA_INACTIVE, myprintf(("in inactive, %s, vfsp %p\n",
-	    coda_f2s(&cp->c_fid), vp->v_mount)););
-	vp->v_object = NULL;
-
-	/*
-	 * If an array has been allocated to hold the symlink, deallocate it.
-	 */
-	if ((coda_symlink_cache) && (VALID_SYMLINK(cp))) {
-		if (cp->c_symlink == NULL)
-			panic("coda_inactive: null symlink pointer in cnode");
-		CODA_FREE(cp->c_symlink, cp->c_symlen);
-		cp->c_flags &= ~C_SYMLINK;
-		cp->c_symlen = 0;
-	}
-
-	/*
-	 * Remove it from the table so it can't be found.
-	 */
-	coda_unsave(cp);
-	if ((struct coda_mntinfo *)(vp->v_mount->mnt_data) == NULL) {
-		myprintf(("Help! vfsp->vfs_data was NULL, but vnode %p "
-		    "wasn't dying\n", vp));
-		panic("badness in coda_inactive\n");
-	}
-	if (IS_UNMOUNTING(cp)) {
-#ifdef	DEBUG
-		printf("coda_inactive: IS_UNMOUNTING use %d: vp %p, cp %p\n",
-		    vrefcnt(vp), vp, cp);
-		if (cp->c_ovp != NULL)
-			printf("coda_inactive: cp->ovp != NULL use %d: vp "
-			    "%p, cp %p\n", vrefcnt(vp), vp, cp);
-#endif
-	} else
-		vgone(vp);
-	MARK_INT_SAT(CODA_INACTIVE_STATS);
-	return (0);
-}
-
-/*
- * Remote filesystem operations having to do with directory manipulation.
- */
-
-/*
- * In FreeBSD, lookup returns the vnode locked.
- */
-int
-coda_lookup(struct vop_cachedlookup_args *ap)
-{
-	/* true args */
-	struct vnode *dvp = ap->a_dvp;
-	struct cnode *dcp = VTOC(dvp);
-	struct vnode **vpp = ap->a_vpp;
-	/*
-	 * It looks as though ap->a_cnp->ni_cnd->cn_nameptr holds the rest of
-	 * the string to xlate, and that we must try to get at least
-	 * ap->a_cnp->ni_cnd->cn_namelen of those characters to macth.  I
-	 * could be wrong.
-	 */
-	struct componentname  *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* locals */
-	struct cnode *cp;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-	struct CodaFid VFid;
-	int vtype;
-	int error = 0;
-
-	MARK_ENTRY(CODA_LOOKUP_STATS);
-	CODADEBUG(CODA_LOOKUP, myprintf(("lookup: %s in %s\n", nm,
-	    coda_f2s(&dcp->c_fid))););
-
-	/*
-	 * Check for lookup of control object.
-	 */
-	if (IS_CTL_NAME(dvp, nm, len)) {
-		*vpp = coda_ctlvp;
-		vref(*vpp);
-		MARK_INT_SAT(CODA_LOOKUP_STATS);
-		goto exit;
-	}
-	if (len+1 > CODA_MAXNAMLEN) {
-		MARK_INT_FAIL(CODA_LOOKUP_STATS);
-		CODADEBUG(CODA_LOOKUP, myprintf(("name too long: lookup, "
-		    "%s (%s)\n", coda_f2s(&dcp->c_fid), nm)););
-		*vpp = NULL;
-		error = EINVAL;
-		goto exit;
-	}
-
-	error = venus_lookup(vtomi(dvp), &dcp->c_fid, nm, len, cred,
-	    td->td_proc, &VFid, &vtype);
-	if (error) {
-		MARK_INT_FAIL(CODA_LOOKUP_STATS);
-		CODADEBUG(CODA_LOOKUP, myprintf(("lookup error on %s "
-		    "(%s)%d\n", coda_f2s(&dcp->c_fid), nm, error)););
-		*vpp = NULL;
-	} else {
-		MARK_INT_SAT(CODA_LOOKUP_STATS);
-		CODADEBUG(CODA_LOOKUP, myprintf(("lookup: %s type %o "
-		    "result %d\n", coda_f2s(&VFid), vtype, error)););
-		cp = make_coda_node(&VFid, dvp->v_mount, vtype);
-    		*vpp = CTOV(cp);
-
-    		/*
-		 * Enter the new vnode in the namecache only if the top bit
-		 * isn't set.
-		 *
-		 * And don't enter a new vnode for an invalid one!
-		 */
-		if (!(vtype & CODA_NOCACHE) && (cnp->cn_flags & MAKEENTRY))
-			cache_enter(dvp, *vpp, cnp);
-	}
-exit:
-	/*
-	 * If we are creating, and this was the last name to be looked up,
-	 * and the error was ENOENT, then there really shouldn't be an error
-	 * and we can make the leaf NULL and return success.  Since this is
-	 * supposed to work under Mach as well as FreeBSD, we're leaving this
-	 * fn wrapped.  We also must tell lookup/namei that we need to save
-	 * the last component of the name.  (Create will have to free the
-	 * name buffer later...lucky us...).
-	 */
-	if (((cnp->cn_nameiop == CREATE) || (cnp->cn_nameiop == RENAME))
-	    && (cnp->cn_flags & ISLASTCN) && (error == ENOENT)) {
-		error = EJUSTRETURN;
-		cnp->cn_flags |= SAVENAME;
-		*ap->a_vpp = NULL;
-	}
-
-	/*
-	 * If we are removing, and we are at the last element, and we found
-	 * it, then we need to keep the name around so that the removal will
-	 * go ahead as planned.  Unfortunately, this will probably also lock
-	 * the to-be-removed vnode, which may or may not be a good idea.
-	 * I'll have to look at the bits of coda_remove to make sure.  We'll
-	 * only save the name if we did in fact find the name, otherwise
-	 * coda_remove won't have a chance to free the pathname.
-	 */
-	if ((cnp->cn_nameiop == DELETE) && (cnp->cn_flags & ISLASTCN)
-	    && !error)
-		cnp->cn_flags |= SAVENAME;
-
-	/*
-	 * If the lookup went well, we need to (potentially?) unlock the
-	 * parent, and lock the child.  We are only responsible for checking
-	 * to see if the parent is supposed to be unlocked before we return.
-	 * We must always lock the child (provided there is one, and (the
-	 * parent isn't locked or it isn't the same as the parent.)  Simple,
-	 * huh?  We can never leave the parent locked unless we are ISLASTCN.
-	 */
-	if (!error || (error == EJUSTRETURN)) {
-		if (cnp->cn_flags & ISDOTDOT) {
-			VOP_UNLOCK(dvp, 0);
-			/*
-			 * The parent is unlocked.  As long as there is a
-			 * child, lock it without bothering to check anything
-			 * else.
-			 */
-			if (*ap->a_vpp)
-				vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
-			vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
-		} else {
-			/*
-			 * The parent is locked, and may be the same as the
-			 * child.  If different, go ahead and lock it.
-			 */
-			if (*ap->a_vpp && (*ap->a_vpp != dvp))
-				vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
-		}
-	} else {
-		/*
-		 * If the lookup failed, we need to ensure that the leaf is
-		 * NULL.
-		 *
-		 * Don't change any locking?
-		 */
-		*ap->a_vpp = NULL;
-	}
-	return (error);
-}
-
-/*ARGSUSED*/
-int
-coda_create(struct vop_create_args *ap)
-{
-	/* true args */
-	struct vnode *dvp = ap->a_dvp;
-	struct cnode *dcp = VTOC(dvp);
-	struct vattr *va = ap->a_vap;
-	int exclusive = 1;
-	int mode = ap->a_vap->va_mode;
-	struct vnode **vpp = ap->a_vpp;
-	struct componentname  *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* locals */
-	int error;
-	struct cnode *cp;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-	struct CodaFid VFid;
-	struct vattr attr;
-
-	MARK_ENTRY(CODA_CREATE_STATS);
-
-	/*
-	 * All creates are exclusive XXX.
-	 *
-	 * I'm assuming the 'mode' argument is the file mode bits XXX.
-	 *
-	 * Check for create of control object.
-	 */
-	if (IS_CTL_NAME(dvp, nm, len)) {
-		*vpp = (struct vnode *)0;
-		MARK_INT_FAIL(CODA_CREATE_STATS);
-		return (EACCES);
-	}
-	error = venus_create(vtomi(dvp), &dcp->c_fid, nm, len, exclusive,
-	    mode, va, cred, td->td_proc, &VFid, &attr);
-	if (!error) {
-		/*
-		 * If this is an exclusive create, panic if the file already
-		 * exists.
-		 *
-		 * Venus should have detected the file and reported EEXIST.
-		 */
-		if ((exclusive == 1) && (coda_find(&VFid) != NULL))
-	  	  	panic("cnode existed for newly created file!");
-		cp = make_coda_node(&VFid, dvp->v_mount, attr.va_type);
-		*vpp = CTOV(cp);
-
-		/*
-		 * Update va to reflect the new attributes.
-		 */
-		(*va) = attr;
-
-		/*
-		 * Update the attribute cache and mark it as valid.
-		 */
-		if (coda_attr_cache) {
-			VTOC(*vpp)->c_vattr = attr;
-			VTOC(*vpp)->c_flags |= C_VATTR;
-		}
-
-		/*
-		 * Invalidate the parent's attr cache, the modification time
-		 * has changed.
-		 */
-		VTOC(dvp)->c_flags &= ~C_VATTR;
-		cache_enter(dvp, *vpp, cnp);
-		CODADEBUG(CODA_CREATE, myprintf(("create: %s, result %d\n",
-		    coda_f2s(&VFid), error)););
-	} else {
-		*vpp = (struct vnode *)0;
-		CODADEBUG(CODA_CREATE, myprintf(("create error %d\n",
-		    error)););
-	}
-	if (!error) {
-		if (cnp->cn_flags & MAKEENTRY)
-			cache_enter(dvp, *vpp, cnp);
-		if (cnp->cn_flags & LOCKLEAF)
-			vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
-	} else if (error == ENOENT) {
-		/*
-		 * XXXRW: We only enter a negative entry if ENOENT is
-		 * returned, not other errors.  But will Venus invalidate dvp
-		 * properly in all cases when new files appear via the
-		 * network rather than a local operation?
-		 */
-		if (cnp->cn_flags & MAKEENTRY)
-			cache_enter(dvp, NULL, cnp);
-	}
-	return (error);
-}
-
-int
-coda_remove(struct vop_remove_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct vnode *dvp = ap->a_dvp;
-	struct cnode *cp = VTOC(dvp);
-	struct componentname  *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* locals */
-	int error;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-#if 0
-	struct cnode *tp;
-#endif
-
-	MARK_ENTRY(CODA_REMOVE_STATS);
-	CODADEBUG(CODA_REMOVE, myprintf(("remove: %s in %s\n", nm,
-	    coda_f2s(&cp->c_fid))););
-
-	/*
-	 * Check for remove of control object.
-	 */
-	if (IS_CTL_NAME(dvp, nm, len)) {
-		MARK_INT_FAIL(CODA_REMOVE_STATS);
-		return (ENOENT);
-	}
-
-	/*
-	 * Invalidate the parent's attr cache, the modification time has
-	 * changed.  We don't yet know if the last reference to the file is
-	 * being removed, but we do know the reference count on the child has
-	 * changed, so invalidate its attr cache also.
-	 */
-	VTOC(dvp)->c_flags &= ~C_VATTR;
-	VTOC(vp)->c_flags &= ~(C_VATTR | C_ACCCACHE);
-	error = venus_remove(vtomi(dvp), &cp->c_fid, nm, len, cred,
-	    td->td_proc);
-	cache_purge(vp);
-	CODADEBUG(CODA_REMOVE, myprintf(("in remove result %d\n",error)););
-	return (error);
-}
-
-int
-coda_link(struct vop_link_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct vnode *tdvp = ap->a_tdvp;
-	struct cnode *tdcp = VTOC(tdvp);
-	struct componentname *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* locals */
-	int error;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-
-	MARK_ENTRY(CODA_LINK_STATS);
-
-	if (codadebug & CODADBGMSK(CODA_LINK)) {
-		myprintf(("nb_link:   vp fid: %s\n", coda_f2s(&cp->c_fid)));
-		myprintf(("nb_link: tdvp fid: %s)\n",
-		    coda_f2s(&tdcp->c_fid)));
-	}
-	if (codadebug & CODADBGMSK(CODA_LINK)) {
-		myprintf(("link:   vp fid: %s\n", coda_f2s(&cp->c_fid)));
-		myprintf(("link: tdvp fid: %s\n", coda_f2s(&tdcp->c_fid)));
-	}
-
-	/*
-	 * Check for link to/from control object.
-	 */
-	if (IS_CTL_NAME(tdvp, nm, len) || IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_LINK_STATS);
-		return (EACCES);
-	}
-	error = venus_link(vtomi(vp), &cp->c_fid, &tdcp->c_fid, nm, len,
-	    cred, td->td_proc);
-
-	/*
-	 * Invalidate the parent's attr cache, the modification time has
-	 * changed.
-	 */
-	VTOC(tdvp)->c_flags &= ~C_VATTR;
-	VTOC(vp)->c_flags &= ~C_VATTR;
-	CODADEBUG(CODA_LINK, myprintf(("in link result %d\n",error)););
-	return (error);
-}
-
-int
-coda_rename(struct vop_rename_args *ap)
-{
-	/* true args */
-	struct vnode *fvp = ap->a_fvp;
-	struct vnode *tvp = ap->a_tvp;
-	struct vnode *odvp = ap->a_fdvp;
-	struct cnode *odcp = VTOC(odvp);
-	struct componentname  *fcnp = ap->a_fcnp;
-	struct vnode *ndvp = ap->a_tdvp;
-	struct cnode *ndcp = VTOC(ndvp);
-	struct componentname  *tcnp = ap->a_tcnp;
-	struct ucred *cred = fcnp->cn_cred;
-	struct thread *td = fcnp->cn_thread;
-	/* true args */
-	int error;
-	const char *fnm = fcnp->cn_nameptr;
-	int flen = fcnp->cn_namelen;
-	const char *tnm = tcnp->cn_nameptr;
-	int tlen = tcnp->cn_namelen;
-
-	MARK_ENTRY(CODA_RENAME_STATS);
-
-	/*
-	 * Check for rename involving control object.
-	 */
-	if (IS_CTL_NAME(odvp, fnm, flen) || IS_CTL_NAME(ndvp, tnm, tlen)) {
-		MARK_INT_FAIL(CODA_RENAME_STATS);
-		return (EACCES);
-	}
-
-	/*
-	 * Remove the entries for both source and target directories, which
-	 * should catch references to the children.  Perhaps we could purge
-	 * less?
-	 */
-	cache_purge(odvp);
-	cache_purge(ndvp);
-
-	/*
-	 * Invalidate parent directories as modification times have changed.
-	 * Invalidate access cache on renamed file as rights may have
-	 * changed.
-	 */
-	VTOC(odvp)->c_flags &= ~C_VATTR;
-	VTOC(ndvp)->c_flags &= ~C_VATTR;
-	VTOC(fvp)->c_flags &= ~C_ACCCACHE;
-	if (flen+1 > CODA_MAXNAMLEN) {
-		MARK_INT_FAIL(CODA_RENAME_STATS);
-		error = EINVAL;
-		goto exit;
-	}
-	if (tlen+1 > CODA_MAXNAMLEN) {
-		MARK_INT_FAIL(CODA_RENAME_STATS);
-		error = EINVAL;
-		goto exit;
-	}
-	error = venus_rename(vtomi(odvp), &odcp->c_fid, &ndcp->c_fid, fnm,
-	    flen, tnm, tlen, cred, td->td_proc);
-exit:
-	CODADEBUG(CODA_RENAME, myprintf(("in rename result %d\n",error)););
-
-	/*
-	 * Update namecache to reflect that the names of various objects may
-	 * have changed (or gone away entirely).
-	 */
-	cache_purge(fvp);
-	cache_purge(tvp);
-
-	/*
-	 * Release parents first, then children.
-	 */
-	vrele(odvp);
-	if (tvp) {
-		if (tvp == ndvp)
-			vrele(ndvp);
-		else
-			vput(ndvp);
-		vput(tvp);
-	} else
-		vput(ndvp);
-	vrele(fvp);
-	return (error);
-}
-
-int
-coda_mkdir(struct vop_mkdir_args *ap)
-{
-	/* true args */
-	struct vnode *dvp = ap->a_dvp;
-	struct cnode *dcp = VTOC(dvp);
-	struct componentname  *cnp = ap->a_cnp;
-	struct vattr *va = ap->a_vap;
-	struct vnode **vpp = ap->a_vpp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* locals */
-	int error;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-	struct cnode *cp;
-	struct CodaFid VFid;
-	struct vattr ova;
-
-	MARK_ENTRY(CODA_MKDIR_STATS);
-
-	/*
-	 * Check for mkdir of target object.
-	 */
-	if (IS_CTL_NAME(dvp, nm, len)) {
-		*vpp = (struct vnode *)0;
-		MARK_INT_FAIL(CODA_MKDIR_STATS);
-		return (EACCES);
-	}
-	if (len+1 > CODA_MAXNAMLEN) {
-		*vpp = (struct vnode *)0;
-		MARK_INT_FAIL(CODA_MKDIR_STATS);
-		return (EACCES);
-	}
-	error = venus_mkdir(vtomi(dvp), &dcp->c_fid, nm, len, va, cred,
-	    td->td_proc, &VFid, &ova);
-	if (!error) {
-		if (coda_find(&VFid) != NULL)
-			panic("cnode existed for newly created directory!");
-		cp =  make_coda_node(&VFid, dvp->v_mount, va->va_type);
-		*vpp = CTOV(cp);
-
-		/*
-		 * Enter the new vnode in the Name Cache.
-		 */
-		if (cnp->cn_flags & MAKEENTRY)
-			cache_enter(dvp, *vpp, cnp);
-
-		/*
-		 * Update the attr cache and mark as valid.
-		 */
-		if (coda_attr_cache) {
-			VTOC(*vpp)->c_vattr = ova;
-			VTOC(*vpp)->c_flags |= C_VATTR;
-		}
-
-		/*
-		 * Invalidate the parent's attr cache, the modification time
-		 * has changed.
-		 */
-		VTOC(dvp)->c_flags &= ~C_VATTR;
-		vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
-		CODADEBUG( CODA_MKDIR, myprintf(("mkdir: %s result %d\n",
-		    coda_f2s(&VFid), error)););
-	} else {
-		*vpp = NULL;
-		CODADEBUG(CODA_MKDIR, myprintf(("mkdir error %d\n",error)););
-	}
-	return (error);
-}
-
-int
-coda_rmdir(struct vop_rmdir_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct vnode *dvp = ap->a_dvp;
-	struct cnode *dcp = VTOC(dvp);
-	struct componentname  *cnp = ap->a_cnp;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	/* true args */
-	int error;
-	const char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-#if 0
-	struct cnode *cp;
-#endif
-
-	MARK_ENTRY(CODA_RMDIR_STATS);
-
-	/*
-	 * Check for rmdir of control object.
-	 */
-	if (IS_CTL_NAME(dvp, nm, len)) {
-		MARK_INT_FAIL(CODA_RMDIR_STATS);
-		return (ENOENT);
-	}
-
-	/*
-	 * Possibly somewhat conservative purging, perhaps we just need to
-	 * purge vp?
-	 */
-	cache_purge(dvp);
-	cache_purge(vp);
-
-	/*
-	 * Invalidate the parent's attr cache, the modification time has
-	 * changed.
-	 */
-	dcp->c_flags &= ~C_VATTR;
-	error = venus_rmdir(vtomi(dvp), &dcp->c_fid, nm, len, cred,
-	    td->td_proc);
-	CODADEBUG(CODA_RMDIR, myprintf(("in rmdir result %d\n", error)););
-	return (error);
-}
-
-int
-coda_symlink(struct vop_symlink_args *ap)
-{
-	/* true args */
-	struct vnode *tdvp = ap->a_dvp;
-	struct cnode *tdcp = VTOC(tdvp);
-	struct componentname *cnp = ap->a_cnp;
-	struct vattr *tva = ap->a_vap;
-	char *path = ap->a_target;
-	struct ucred *cred = cnp->cn_cred;
-	struct thread *td = cnp->cn_thread;
-	struct vnode **vpp = ap->a_vpp;
-	/* locals */
-	int error;
-
-	/*-
-	 * XXX I'm assuming the following things about coda_symlink's
-	 * arguments:
-	 *       t(foo) is the new name/parent/etc being created.
-	 *       lname is the contents of the new symlink.
-	 */
-	char *nm = cnp->cn_nameptr;
-	int len = cnp->cn_namelen;
-	int plen = strlen(path);
-
-	/*
-	 * Here's the strategy for the moment: perform the symlink, then do a
-	 * lookup to grab the resulting vnode.  I know this requires two
-	 * communications with Venus for a new sybolic link, but that's the
-	 * way the ball bounces.  I don't yet want to change the way the Mach
-	 * symlink works.  When Mach support is deprecated, we should change
-	 * symlink so that the common case returns the resultant vnode in a
-	 * vpp argument.
-	 */
-	MARK_ENTRY(CODA_SYMLINK_STATS);
-
-	/*
-	 * Check for symlink of control object.
-	 */
-	if (IS_CTL_NAME(tdvp, nm, len)) {
-		MARK_INT_FAIL(CODA_SYMLINK_STATS);
-		return (EACCES);
-	}
-	if (plen+1 > CODA_MAXPATHLEN) {
-		MARK_INT_FAIL(CODA_SYMLINK_STATS);
-		return (EINVAL);
-	}
-	if (len+1 > CODA_MAXNAMLEN) {
-		MARK_INT_FAIL(CODA_SYMLINK_STATS);
-		error = EINVAL;
-		goto exit;
-	}
-	error = venus_symlink(vtomi(tdvp), &tdcp->c_fid, path, plen, nm, len,
-	    tva, cred, td->td_proc);
-
-	/*
-	 * Invalidate the parent's attr cache, the modification time has
-	 * changed.
-	 */
-	tdcp->c_flags &= ~C_VATTR;
-	if (error == 0)
-		error = VOP_LOOKUP(tdvp, vpp, cnp);
-exit:
-	CODADEBUG(CODA_SYMLINK, myprintf(("in symlink result %d\n",error)););
-	return (error);
-}
-
-/*
- * Read directory entries.
- *
- * XXX: This forwards the operator straight to the cache vnode using
- * VOP_READDIR(), rather than calling venus_readdir().  Why?
- */
-int
-coda_readdir(struct vop_readdir_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	struct uio *uiop = ap->a_uio;
-	struct ucred *cred = ap->a_cred;
-	int *eofflag = ap->a_eofflag;
-	u_long **cookies = ap->a_cookies;
-	int *ncookies = ap->a_ncookies;
-	struct thread *td = ap->a_uio->uio_td;
-	/* upcall decl */
-	/* locals */
-	int error = 0;
-	int opened_internally = 0;
-
-	MARK_ENTRY(CODA_READDIR_STATS);
-	CODADEBUG(CODA_READDIR, myprintf(("coda_readdir(%p, %zd, %lld, %d)\n",
-	    (void *)uiop->uio_iov->iov_base, uiop->uio_resid,
-	    (long long)uiop->uio_offset, uiop->uio_segflg)););
-
-	/*
-	 * Check for readdir of control object.
-	 */
-	if (IS_CTL_VP(vp)) {
-		MARK_INT_FAIL(CODA_READDIR_STATS);
-		return (ENOENT);
-	}
-
-	/*
-	 * If directory is not already open do an "internal open" on it.
-	 *
-	 * XXX: Why would this happen?  For files, there's memory mapping,
-	 * execution, and other kernel access paths such as ktrace.  For
-	 * directories, it is less clear.
-	 */
-	if (cp->c_ovp == NULL) {
-		opened_internally = 1;
-		MARK_INT_GEN(CODA_OPEN_STATS);
-		error = VOP_OPEN(vp, FREAD, cred, td, NULL);
-		printf("coda_readdir: Internally Opening %p\n", vp);
-		if (error) {
-			printf("coda_readdir: VOP_OPEN on container failed "
-			   "%d\n", error);
-			return (error);
-		}
-	}
-
-	/*
-	 * Have UFS handle the call.
-	 */
-	CODADEBUG(CODA_READDIR, myprintf(("indirect readdir: fid = %s, "
-	    "refcnt = %d\n", coda_f2s(&cp->c_fid), vp->v_usecount)););
-	vn_lock(cp->c_ovp, LK_SHARED | LK_RETRY);
-	error = VOP_READDIR(cp->c_ovp, uiop, cred, eofflag, ncookies,
-	    cookies);
-	VOP_UNLOCK(cp->c_ovp, 0);
-	if (error)
-		MARK_INT_FAIL(CODA_READDIR_STATS);
-	else
-		MARK_INT_SAT(CODA_READDIR_STATS);
-
-	/*
-	 * Do an "internal close" if necessary.
-	 */
-	if (opened_internally) {
-		MARK_INT_GEN(CODA_CLOSE_STATS);
-		(void)VOP_CLOSE(vp, FREAD, cred, td);
-	}
-	return (error);
-}
-
-int
-coda_reclaim(struct vop_reclaim_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	/* upcall decl */
-	/* locals */
-
-	/*
-	 * Forced unmount/flush will let vnodes with non-zero use be
-	 * destroyed!
-	 */
-	ENTRY;
-
-	if (IS_UNMOUNTING(cp)) {
-#ifdef	DEBUG
-		if (VTOC(vp)->c_ovp) {
-			if (IS_UNMOUNTING(cp))
-				printf("coda_reclaim: c_ovp not void: vp "
-				    "%p, cp %p\n", vp, cp);
-		}
-#endif
-	}
-	cache_purge(vp);
-	coda_free(VTOC(vp));
-	vp->v_data = NULL;
-	vp->v_object = NULL;
-	return (0);
-}
-
-int
-coda_lock(struct vop_lock1_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	/* upcall decl */
-	/* locals */
-
-	ENTRY;
-	if ((ap->a_flags & LK_INTERLOCK) == 0) {
-		VI_LOCK(vp);
-		ap->a_flags |= LK_INTERLOCK;
-	}
-	if (coda_lockdebug)
-		myprintf(("Attempting lock on %s\n", coda_f2s(&cp->c_fid)));
-	return (vop_stdlock(ap));
-}
-
-int
-coda_unlock(struct vop_unlock_args *ap)
-{
-	/* true args */
-	struct vnode *vp = ap->a_vp;
-	struct cnode *cp = VTOC(vp);
-	/* upcall decl */
-	/* locals */
-
-	ENTRY;
-	if (coda_lockdebug)
-		myprintf(("Attempting unlock on %s\n",
-		    coda_f2s(&cp->c_fid)));
-	return (vop_stdunlock(ap));
-}
-
-int
-coda_islocked(struct vop_islocked_args *ap)
-{
-	/* true args */
-
-	ENTRY;
-	return (vop_stdislocked(ap));
-}
-
-static void
-coda_print_vattr(struct vattr *attr)
-{
-	char *typestr;
-
-	switch (attr->va_type) {
-	case VNON:
-		typestr = "VNON";
-		break;
-
-	case VREG:
-		typestr = "VREG";
-		break;
-
-	case VDIR:
-		typestr = "VDIR";
-		break;
-
-	case VBLK:
-		typestr = "VBLK";
-		break;
-
-	case VCHR:
-		typestr = "VCHR";
-		break;
-
-	case VLNK:
-		typestr = "VLNK";
-		break;
-
-	case VSOCK:
-		typestr = "VSCK";
-		break;
-
-	case VFIFO:
-		typestr = "VFFO";
-		break;
-
-	case VBAD:
-		typestr = "VBAD";
-		break;
-
-	default:
-		typestr = "????";
-		break;
-	}
-	myprintf(("attr: type %s mode %d uid %d gid %d fsid %d rdev %d\n",
-	    typestr, (int)attr->va_mode, (int)attr->va_uid,
-	    (int)attr->va_gid, (int)attr->va_fsid, (int)attr->va_rdev));
-	myprintf(("      fileid %d nlink %d size %d blocksize %d bytes %d\n",
-	    (int)attr->va_fileid, (int)attr->va_nlink, (int)attr->va_size,
-	    (int)attr->va_blocksize,(int)attr->va_bytes));
-	myprintf(("      gen %ld flags %ld vaflags %d\n", attr->va_gen,
-	    attr->va_flags, attr->va_vaflags));
-	myprintf(("      atime sec %d nsec %d\n", (int)attr->va_atime.tv_sec,
-	    (int)attr->va_atime.tv_nsec));
-	myprintf(("      mtime sec %d nsec %d\n", (int)attr->va_mtime.tv_sec,
-	    (int)attr->va_mtime.tv_nsec));
-	myprintf(("      ctime sec %d nsec %d\n", (int)attr->va_ctime.tv_sec,
-	    (int)attr->va_ctime.tv_nsec));
-}
-
-/*
- * How to print a ucred.
- */
-void
-coda_print_cred(struct ucred *cred)
-{
-	int i;
-
-	myprintf(("ref %d\tuid %d\n",cred->cr_ref,cred->cr_uid));
-	for (i=0; i < cred->cr_ngroups; i++)
-		myprintf(("\tgroup %d: (%d)\n",i,cred->cr_groups[i]));
-	myprintf(("\n"));
-}
-
-/*
- * Return a vnode for the given fid.  If no cnode exists for this fid create
- * one and put it in a table hashed by coda_f2i().  If the cnode for this fid
- * is already in the table return it (ref count is incremented by coda_find.
- * The cnode will be flushed from the table when coda_inactive calls
- * coda_unsave.
- */
-struct cnode *
-make_coda_node(struct CodaFid *fid, struct mount *vfsp, short type)
-{
-	struct cnode *cp;
-	struct vnode *vp;
-	int err;
-
-	/*
-	 * XXXRW: This really needs a moderate amount of reworking.  We need
-	 * to properly tolerate failures of getnewvnode() and insmntque(),
-	 * and callers need to be able to accept an error back from
-	 * make_coda_node.  There may also be more general issues in how we
-	 * handle forced unmount.  Finally, if/when Coda loses its dependency
-	 * on Giant, the ordering of this needs rethinking.
-	 */
-	cp = coda_find(fid);
-	if (cp != NULL) {
-		vref(CTOV(cp));
-		return (cp);
-	}
-	cp = coda_alloc();
-	cp->c_fid = *fid;
-	err = getnewvnode("coda", vfsp, &coda_vnodeops, &vp);
-	if (err)
-		panic("coda: getnewvnode returned error %d\n", err);
-	vp->v_data = cp;
-	vp->v_type = type;
-	cp->c_vnode = vp;
-	coda_save(cp);
-	err = insmntque(vp, vfsp);
-	if (err != 0)
-		printf("coda: insmntque failed: error %d", err);
-	return (cp);
-}
-
-int
-coda_pathconf(struct vop_pathconf_args *ap)
-{
-
-	switch (ap->a_name) {
-	case _PC_NAME_MAX:
-		*ap->a_retval = CODA_MAXNAMLEN;
-		return (0);
-
-	case _PC_PATH_MAX:
-		*ap->a_retval = CODA_MAXPATHLEN;
-		return (0);
-
-	default:
-		return (vop_stdpathconf(ap));
-	}
-}
diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h
deleted file mode 100644
index e43b09f..0000000
--- a/sys/fs/coda/coda_vnops.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- *
- *             Coda: an Experimental Distributed File System
- *                              Release 3.1
- *
- *           Copyright (c) 1987-1998 Carnegie Mellon University
- *                          All Rights Reserved
- *
- * Permission  to  use, copy, modify and distribute this software and its
- * documentation is hereby granted,  provided  that  both  the  copyright
- * notice  and  this  permission  notice  appear  in  all  copies  of the
- * software, derivative works or  modified  versions,  and  any  portions
- * thereof, and that both notices appear in supporting documentation, and
- * that credit is given to Carnegie Mellon University  in  all  documents
- * and publicity pertaining to direct or indirect use of this code or its
- * derivatives.
- *
- * CODA IS AN EXPERIMENTAL SOFTWARE SYSTEM AND IS  KNOWN  TO  HAVE  BUGS,
- * SOME  OF  WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON ALLOWS
- * FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.   CARNEGIE  MELLON
- * DISCLAIMS  ANY  LIABILITY  OF  ANY  KIND  FOR  ANY  DAMAGES WHATSOEVER
- * RESULTING DIRECTLY OR INDIRECTLY FROM THE USE OF THIS SOFTWARE  OR  OF
- * ANY DERIVATIVE WORK.
- *
- * Carnegie  Mellon  encourages  users  of  this  software  to return any
- * improvements or extensions that  they  make,  and  to  grant  Carnegie
- * Mellon the rights to redistribute these changes without encumbrance.
- *
- * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- * $FreeBSD$
-  */
-
-/*
- * Mach Operating System
- * Copyright (c) 1990 Carnegie-Mellon University
- * Copyright (c) 1989 Carnegie-Mellon University
- * All rights reserved.  The CMU software License Agreement specifies
- * the terms and conditions for use and redistribution.
- */
-
-/*
- * This code was written for the Coda filesystem at Carnegie Mellon
- * University.  Contributers include David Steere, James Kistler, and
- * M. Satyanarayanan.
- */
-
-#ifndef _CODA_VNOPS_H_
-#define	_CODA_VNOPS_H_
-
-/*
- * FreeBSD interfaces to the vnodeops.
- */
-vop_open_t	coda_open;
-vop_close_t	coda_close;
-vop_read_t	coda_read;
-vop_write_t	coda_write;
-vop_ioctl_t	coda_ioctl;
-vop_getattr_t	coda_getattr;
-vop_setattr_t	coda_setattr;
-vop_access_t	coda_access;
-vop_readlink_t	coda_readlink;
-vop_fsync_t	coda_fsync;
-vop_inactive_t	coda_inactive;
-vop_cachedlookup_t	coda_lookup;
-vop_create_t	coda_create;
-vop_remove_t	coda_remove;
-vop_link_t	coda_link;
-vop_rename_t	coda_rename;
-vop_mkdir_t	coda_mkdir;
-vop_rmdir_t	coda_rmdir;
-vop_symlink_t	coda_symlink;
-vop_readdir_t	coda_readdir;
-vop_strategy_t	coda_strategy;
-vop_reclaim_t	coda_reclaim;
-vop_lock1_t	coda_lock;
-vop_unlock_t	coda_unlock;
-vop_islocked_t	coda_islocked;
-vop_pathconf_t	coda_pathconf;
-
-int	coda_rdwr(struct vnode *vp, struct uio *uiop, enum uio_rw rw,
-	    int ioflag, struct ucred *cred, struct thread *td);
-void	coda_print_cred(struct ucred *cred);
-
-#endif /* !_CODA_VNOPS_H_ */
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
deleted file mode 100644
index ebcb39c..0000000
--- a/sys/modules/coda/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../fs/coda
-
-KMOD=	coda
-SRCS=	vnode_if.h \
-	coda_fbsd.c coda_psdev.c coda_subr.c coda_venus.c coda_vfsops.c \
-	coda_vnops.c opt_coda.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/coda5/Makefile b/sys/modules/coda5/Makefile
deleted file mode 100644
index f9aea09..0000000
--- a/sys/modules/coda5/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../fs/coda
-
-KMOD=	coda5
-SRCS=	vnode_if.h \
-	coda_fbsd.c coda_psdev.c coda_subr.c \
-	coda_venus.c coda_vfsops.c coda_vnops.c \
-	opt_coda.h
-
-CFLAGS+= -DCODA5_MODULE
-
-.include <bsd.kmod.mk>