diff options
author | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2001-05-01 08:13:21 +0000 |
commit | bcca5847d5e7a197302d7689cd358f5ce6316d0a (patch) | |
tree | a1f5dea8640fa8bdeebec40477b6fdcf33b3e51b /sys/fs/umapfs | |
parent | 7d3d350edce373e3ec1e8e7fe7d94bb08d031a24 (diff) | |
download | FreeBSD-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/umapfs')
-rw-r--r-- | sys/fs/umapfs/umap_subr.c | 6 | ||||
-rw-r--r-- | sys/fs/umapfs/umap_vfsops.c | 7 | ||||
-rw-r--r-- | sys/fs/umapfs/umap_vnops.c | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/sys/fs/umapfs/umap_subr.c b/sys/fs/umapfs/umap_subr.c index 9b9806e..1f94d50 100644 --- a/sys/fs/umapfs/umap_subr.c +++ b/sys/fs/umapfs/umap_subr.c @@ -40,9 +40,11 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/vnode.h> -#include <sys/mount.h> #include <sys/malloc.h> +#include <sys/mount.h> +#include <sys/proc.h> +#include <sys/vnode.h> + #include <miscfs/umapfs/umap.h> #define LOG2_SIZEVNODE 7 /* log2(sizeof struct vnode) */ diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c index abd1b07..e86467d 100644 --- a/sys/fs/umapfs/umap_vfsops.c +++ b/sys/fs/umapfs/umap_vfsops.c @@ -46,10 +46,13 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/vnode.h> +#include <sys/lock.h> +#include <sys/malloc.h> #include <sys/mount.h> +#include <sys/mutex.h> #include <sys/namei.h> -#include <sys/malloc.h> +#include <sys/vnode.h> + #include <miscfs/umapfs/umap.h> static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure"); diff --git a/sys/fs/umapfs/umap_vnops.c b/sys/fs/umapfs/umap_vnops.c index 669a9ae..5bf29c8 100644 --- a/sys/fs/umapfs/umap_vnops.c +++ b/sys/fs/umapfs/umap_vnops.c @@ -44,11 +44,13 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/sysctl.h> -#include <sys/vnode.h> +#include <sys/lock.h> +#include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> -#include <sys/malloc.h> +#include <sys/sysctl.h> +#include <sys/vnode.h> + #include <miscfs/umapfs/umap.h> #include <miscfs/nullfs/null.h> |