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)

5 files changed, 35 insertions, 23 deletions

diff --git a/sys/nfs/nfs_lock.c b/sys/nfs/nfs_lock.c
index aaac36161d36..9fd243afe960 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>
 
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index 0191b664a813..dc21bc35eaeb 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -40,12 +40,15 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/fnv_hash.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/fnv_hash.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
 #include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <vm/vm_zone.h>
 
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index 3878a77ff20a..55b44ba2b96f 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -52,15 +52,19 @@
  *		Equipment Corporation WRL Research Report 89/5, May 1989.
  */
 #include <sys/param.h>
-#include <sys/vnode.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/protosw.h>
+#include <sys/vnode.h>
 
 #include <vm/vm_zone.h>
 
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index fefeea8ac8eb..5772e4b06d5f 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -43,18 +43,20 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/mount.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
 #include <sys/protosw.h>
+#include <sys/signalvar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/syslog.h>
 #include <sys/sysctl.h>
-#include <sys/signalvar.h>
+#include <sys/syslog.h>
+#include <sys/vnode.h>
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 7f8be03082e3..d5e89726e54a 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -40,17 +40,18 @@
 #include "opt_bootp.h"
 
 #include <sys/param.h>
-#include <sys/sockio.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/sysctl.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mount.h>
 #include <sys/mbuf.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
-#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/vnode.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>