summaryrefslogtreecommitdiffstats
path: root/sys/fs/coda
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
committermarkm <markm@FreeBSD.org>2001-05-01 08:13:21 +0000
commitbcca5847d5e7a197302d7689cd358f5ce6316d0a (patch)
treea1f5dea8640fa8bdeebec40477b6fdcf33b3e51b /sys/fs/coda
parent7d3d350edce373e3ec1e8e7fe7d94bb08d031a24 (diff)
downloadFreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.zip
FreeBSD-src-bcca5847d5e7a197302d7689cd358f5ce6316d0a.tar.gz
Undo part of the tangle of having sys/lock.h and sys/mutex.h included in
other "system" header files. Also help the deprecation of lockmgr.h by making it a sub-include of sys/lock.h and removing sys/lockmgr.h form kernel .c files. Sort sys/*.h includes where possible in affected files. OK'ed by: bde (with reservations)
Diffstat (limited to 'sys/fs/coda')
-rw-r--r--sys/fs/coda/coda_fbsd.c5
-rw-r--r--sys/fs/coda/coda_namecache.c6
-rw-r--r--sys/fs/coda/coda_psdev.c11
-rw-r--r--sys/fs/coda/coda_subr.c4
-rw-r--r--sys/fs/coda/coda_venus.c6
-rw-r--r--sys/fs/coda/coda_vfsops.c8
-rw-r--r--sys/fs/coda/coda_vnops.c17
7 files changed, 30 insertions, 27 deletions
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 8111691..c92b482 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -35,12 +35,13 @@
#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/fcntl.h>
#include <sys/ucred.h>
#include <sys/vnode.h>
-#include <sys/conf.h>
#include <vm/vm.h>
#include <vm/vnode_pager.h>
diff --git a/sys/fs/coda/coda_namecache.c b/sys/fs/coda/coda_namecache.c
index 729c0ad..3b73a67 100644
--- a/sys/fs/coda/coda_namecache.c
+++ b/sys/fs/coda/coda_namecache.c
@@ -77,14 +77,12 @@
*/
#include <sys/param.h>
+#include <sys/systm.h>
#include <sys/errno.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/ucred.h>
-#ifndef insque
-#include <sys/systm.h>
-#endif /* insque */
-
#include <vm/vm.h>
#include <vm/vm_object.h>
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index e6ba198..0d8560f 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -58,15 +58,16 @@ extern int coda_nc_initialized; /* Set if cache has been initialized */
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/ioccom.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
+#include <sys/file.h> /* must come after sys/malloc.h */
#include <sys/mount.h>
-#include <sys/file.h>
-#include <sys/ioccom.h>
+#include <sys/mutex.h>
#include <sys/poll.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
#include <coda/coda.h>
#include <coda/cnode.h>
diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c
index 8c4406b..84546c1 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -59,10 +59,10 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
#include <sys/mount.h>
+#include <sys/socket.h>
#include <coda/coda.h>
#include <coda/cnode.h>
diff --git a/sys/fs/coda/coda_venus.c b/sys/fs/coda/coda_venus.c
index 1784e2f..022009e 100644
--- a/sys/fs/coda/coda_venus.c
+++ b/sys/fs/coda/coda_venus.c
@@ -33,10 +33,12 @@
#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/ioccom.h>
-#include <sys/fcntl.h>
#include <coda/coda.h>
#include <coda/cnode.h>
diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c
index 437e9fd..a640cf4 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -48,14 +48,14 @@
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/conf.h>
#include <sys/kernel.h>
-#include <sys/proc.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <sys/conf.h>
+#include <sys/mount.h>
#include <sys/namei.h>
-#include <net/radix.h>
+#include <sys/proc.h>
#include <sys/socket.h>
-#include <sys/mount.h>
#include <coda/coda.h>
#include <coda/cnode.h>
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index 2619917..1444fb2 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -47,18 +47,19 @@
#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/proc.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
-#include <net/radix.h>
-#include <sys/socket.h>
+#include <sys/file.h> /* Must come after sys/malloc.h */
#include <sys/mount.h>
-#include <sys/errno.h>
-#include <sys/acct.h>
-#include <sys/file.h>
-#include <sys/fcntl.h>
-#include <sys/uio.h>
+#include <sys/mutex.h>
#include <sys/namei.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
#include <vm/vm.h>
#include <vm/vm_object.h>
OpenPOWER on IntegriCloud