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/fdescfs | |
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/fdescfs')
-rw-r--r-- | sys/fs/fdescfs/fdesc_vfsops.c | 11 | ||||
-rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 19 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index e93ad50..900e1de 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -44,15 +44,16 @@ #include <sys/param.h> #include <sys/systm.h> +#include <sys/filedesc.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/malloc.h> +#include <sys/mount.h> #include <sys/proc.h> #include <sys/resourcevar.h> -#include <sys/filedesc.h> -#include <sys/vnode.h> -#include <net/radix.h> #include <sys/socket.h> -#include <sys/mount.h> -#include <sys/malloc.h> +#include <sys/vnode.h> + #include <miscfs/fdesc/fdesc.h> static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 5846ac7..065e0a8 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -44,19 +44,20 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/proc.h> -#include <sys/kernel.h> /* boottime */ +#include <sys/conf.h> +#include <sys/dirent.h> #include <sys/filedesc.h> -#include <sys/vnode.h> +#include <sys/kernel.h> /* boottime */ +#include <sys/lock.h> #include <sys/malloc.h> -#include <sys/file.h> -#include <sys/stat.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/namei.h> -#include <sys/dirent.h> -#include <sys/conf.h> +#include <sys/proc.h> +#include <sys/socket.h> +#include <sys/stat.h> +#include <sys/vnode.h> + #include <miscfs/fdesc/fdesc.h> #define FDL_WANT 0x01 |