summaryrefslogtreecommitdiffstats
path: root/sys/nfs/nfs_lock.c
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/nfs/nfs_lock.c
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/nfs/nfs_lock.c')
-rw-r--r--sys/nfs/nfs_lock.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c
index aaac361..9fd243a 100644
--- a/sys/nfs/nfs_lock.c
+++ b/sys/nfs/nfs_lock.c
@@ -32,17 +32,19 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/fcntl.h>
+#include <sys/kernel.h> /* for hz */
+#include <sys/lock.h>
#include <sys/malloc.h>
+#include <sys/lockf.h> /* for hz */ /* Must come after sys/malloc.h */
#include <sys/mbuf.h>
#include <sys/mount.h>
#include <sys/namei.h>
#include <sys/proc.h>
+#include <sys/resourcevar.h>
+#include <sys/socket.h>
#include <sys/socket.h>
#include <sys/unistd.h>
#include <sys/vnode.h>
-#include <sys/resourcevar.h>
-#include <sys/kernel.h> /* for hz */
-#include <sys/lockf.h> /* for hz */
#include <net/if.h>
OpenPOWER on IntegriCloud