Finish conversion of cfs -> coda

17 files changed, 113 insertions, 73 deletions

diff --git a/sys/coda/cnode.h b/sys/coda/cnode.h
index cefc6a8ccf1f..bd93389c7502 100644
--- a/sys/coda/cnode.h
+++ b/sys/coda/cnode.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cnode.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: cnode.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -47,6 +47,10 @@
 /* 
  * HISTORY
  * $Log: cnode.h,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -160,7 +164,7 @@ MALLOC_DECLARE(M_CODA);
 /*
  * tmp below since we need struct queue
  */
-#include <cfs/cfsk.h>
+#include <coda/coda_kernel.h>
 
 /*
  * Cnode lookup stuff.
diff --git a/sys/coda/coda.h b/sys/coda/coda.h
index 45a30baa2b9c..8e77c20d230f 100644
--- a/sys/coda/coda.h
+++ b/sys/coda/coda.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 4c493861da43..a334745e398d 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_fbsd.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_fbsd.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_fbsd.c,v 1.3 1998/09/11 18:50:16 rvb Exp $
  * 
  */
 
@@ -44,9 +44,9 @@
 #include <vm/vm.h>
 #include <vm/vnode_pager.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfs_vnodeops.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_vnops.h>
 
 #ifdef DEVFS
 #include <sys/devfsext.h>
diff --git a/sys/coda/coda_io.h b/sys/coda/coda_io.h
index a41f5ce29b10..dd12fa1d45d6 100644
--- a/sys/coda/coda_io.h
+++ b/sys/coda/coda_io.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfsio.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cfsio.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_io.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_io.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -46,7 +46,11 @@
 
 /* 
  * HISTORY
- * $Log: cfsio.h,v $
+ * $Log: coda_io.h,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
diff --git a/sys/coda/coda_kernel.h b/sys/coda/coda_kernel.h
index 299d15d6641a..33b372f49b13 100644
--- a/sys/coda/coda_kernel.h
+++ b/sys/coda/coda_kernel.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfsk.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: $
+ * 	@(#) src/sys/coda/coda_kernel.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_kernel.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
  * 
  */
 
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c
index 1a88346d1353..44cc4da6f1c2 100644
--- a/sys/coda/coda_namecache.c
+++ b/sys/coda/coda_namecache.c
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_namecache.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_namecache.c,v 1.4 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -46,7 +46,11 @@
 
 /*
  * HISTORY
- * $Log: cfs_namecache.c,v $
+ * $Log: coda_namecache.c,v $
+ * Revision 1.4  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -224,9 +228,9 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfsnc.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_namecache.h>
 
 /* 
  * Declaration of the name cache data structure.
diff --git a/sys/coda/coda_namecache.h b/sys/coda/coda_namecache.h
index 86063652d42c..f7b319483b07 100644
--- a/sys/coda/coda_namecache.h
+++ b/sys/coda/coda_namecache.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfsnc.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cfsnc.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_namecache.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_namecache.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -46,7 +46,11 @@
 
 /* 
  * HISTORY
- * $Log: cfsnc.h,v $
+ * $Log: coda_namecache.h,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
diff --git a/sys/coda/coda_opstats.h b/sys/coda/coda_opstats.h
index bb1b4f24eb1a..e62c04d3db1f 100644
--- a/sys/coda/coda_opstats.h
+++ b/sys/coda/coda_opstats.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: coda_opstats.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_opstats.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_opstats.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
diff --git a/sys/coda/coda_pioctl.h b/sys/coda/coda_pioctl.h
index aa18e6661f3b..2aa55bbe50e8 100644
--- a/sys/coda/coda_pioctl.h
+++ b/sys/coda/coda_pioctl.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: pioctl.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_pioctl.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_pioctl.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -42,7 +42,11 @@
 
 /*
  * HISTORY
- * $Log: pioctl.h,v $
+ * $Log: coda_pioctl.h,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index d8d763584c72..9edc7d527f0f 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_psdev.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_psdev.c,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -52,7 +52,11 @@
 
 /*
  * HISTORY
- * $Log: cfs_psdev.c,v $
+ * $Log: coda_psdev.c,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -167,10 +171,10 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 #include <sys/poll.h>
 #include <sys/conf.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfsnc.h>
-#include <cfs/cfsio.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_namecache.h>
+#include <coda/coda_io.h>
 
 #define CTL_C
 
diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c
index 3e6472d89903..6e3d0e29c3b0 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_subr.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_subr.c,v 1.4 1998/09/11 18:50:17 rvb Exp $
  * 
   */
 
@@ -45,7 +45,11 @@
 
 /*
  * HISTORY
- * $Log: cfs_subr.c,v $
+ * $Log: coda_subr.c,v $
+ * Revision 1.4  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -215,10 +219,10 @@
 #include <sys/select.h>
 #include <sys/mount.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfs_subr.h>
-#include <cfs/cfsnc.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_subr.h>
+#include <coda/coda_namecache.h>
 
 int coda_active = 0;
 int coda_reuse = 0;
diff --git a/sys/coda/coda_subr.h b/sys/coda/coda_subr.h
index 7a68e58e9ba1..73d9e1631532 100644
--- a/sys/coda/coda_subr.h
+++ b/sys/coda/coda_subr.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: cfs_subr.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_subr.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_subr.h,v 1.4 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
diff --git a/sys/coda/coda_venus.c b/sys/coda/coda_venus.c
index 586d30d2bc13..25dceeb1af76 100644
--- a/sys/coda/coda_venus.c
+++ b/sys/coda/coda_venus.c
@@ -27,7 +27,7 @@
  * 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 $
- *  $Id: coda_venus.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ *  $Id: coda_venus.c,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -39,10 +39,10 @@
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfs_venus.h>
-#include <cfs/pioctl.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_venus.h>
+#include <coda/coda_pioctl.h>
 
 #define DECL_NO_IN(name) 				\
     struct coda_in_hdr *inp;				\
diff --git a/sys/coda/coda_venus.h b/sys/coda/coda_venus.h
index ee0fb4f6cd4e..6fdd15c60fad 100644
--- a/sys/coda/coda_venus.h
+++ b/sys/coda/coda_venus.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
- *  $Id: $
+ * 	@(#) src/sys/coda/coda_venus.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ 
+ *  $Id: coda_venus.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
  * 
  */
 
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index 0abddd31a59b..6b17cad696e9 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -27,7 +27,7 @@
  * 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 $
- *  $Id: coda_vfsops.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ *  $Id: coda_vfsops.c,v 1.4 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -47,6 +47,10 @@
 /*
  * HISTORY
  * $Log: coda_vfsops.c,v $
+ * Revision 1.4  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -189,12 +193,12 @@
 #include <sys/mount.h>
 #include <sys/select.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfs_vfsops.h>
-#include <cfs/cfs_venus.h>
-#include <cfs/cfs_subr.h>
-#include <cfs/coda_opstats.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_vfsops.h>
+#include <coda/coda_venus.h>
+#include <coda/coda_subr.h>
+#include <coda/coda_opstats.h>
 
 #include <miscfs/specfs/specdev.h>
 
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index f505af500d6a..567fb397c121 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- *  	@(#) src/sys/cfs/cfs_vnodeops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_vnodeops.c,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_vnops.c,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
  */
 
@@ -47,7 +47,11 @@
 
 /*
  * HISTORY
- * $Log: cfs_vnodeops.c,v $
+ * $Log: coda_vnops.c,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *
@@ -240,14 +244,14 @@
 #include <vm/vm_extern.h>
 #include <vm/vm_zone.h>
 
-#include <cfs/coda.h>
-#include <cfs/cnode.h>
-#include <cfs/cfs_vnodeops.h>
-#include <cfs/cfs_venus.h>
-#include <cfs/coda_opstats.h>
-#include <cfs/cfs_subr.h>
-#include <cfs/cfsnc.h>
-#include <cfs/pioctl.h>
+#include <coda/coda.h>
+#include <coda/cnode.h>
+#include <coda/coda_vnops.h>
+#include <coda/coda_venus.h>
+#include <coda/coda_opstats.h>
+#include <coda/coda_subr.h>
+#include <coda/coda_namecache.h>
+#include <coda/coda_pioctl.h>
 
 /* 
  * These flags select various performance enhancements.
diff --git a/sys/coda/coda_vnops.h b/sys/coda/coda_vnops.h
index 9ed33878f903..6c787d5e4e86 100644
--- a/sys/coda/coda_vnops.h
+++ b/sys/coda/coda_vnops.h
@@ -26,8 +26,8 @@
  * improvements or extensions that  they  make,  and  to  grant  Carnegie
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
- * 	@(#) src/sys/cfs/cfs_vnodeops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: cfs_vnodeops.h,v 1.2 1998/09/02 19:09:53 rvb Exp $
+ * 	@(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
+ *  $Id: coda_vnops.h,v 1.3 1998/09/11 18:50:17 rvb Exp $
  * 
   */
 
@@ -47,7 +47,11 @@
 
 /*
  * HISTORY
- * $Log: cfs_vnodeops.h,v $
+ * $Log: coda_vnops.h,v $
+ * Revision 1.3  1998/09/11 18:50:17  rvb
+ * All the references to cfs, in symbols, structs, and strings
+ * have been changed to coda.  (Same for CFS.)
+ *
  * Revision 1.2  1998/09/02 19:09:53  rvb
  * Pass2 complete
  *