From c95b982aedc014a22e341b735d4cf1d945eeaaaa Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 13 Oct 2001 06:41:41 +0000
Subject: Backed out vestiges of the quick fixes for the transient breakage of
 <sys/mount.h> in rev.1.106 of the latter (don't include <sys/socket.h> just
 to work around bugs in <sys/mount.h>).

---
 sys/coda/coda_psdev.c         | 1 -
 sys/coda/coda_subr.c          | 1 -
 sys/coda/coda_vfsops.c        | 1 -
 sys/coda/coda_vnops.c         | 1 -
 sys/fs/coda/coda_psdev.c      | 1 -
 sys/fs/coda/coda_subr.c       | 1 -
 sys/fs/coda/coda_vfsops.c     | 1 -
 sys/fs/coda/coda_vnops.c      | 1 -
 sys/fs/devfs/devfs_vfsops.c   | 1 -
 sys/fs/devfs/devfs_vnops.c    | 1 -
 sys/fs/fdescfs/fdesc_vfsops.c | 1 -
 sys/fs/fdescfs/fdesc_vnops.c  | 1 -
 12 files changed, 12 deletions(-)

diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c
index 49d9fd072e22..7014c89ba477 100644
--- a/sys/coda/coda_psdev.c
+++ b/sys/coda/coda_psdev.c
@@ -67,7 +67,6 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 #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/coda/coda_subr.c b/sys/coda/coda_subr.c
index 84546c17673b..21dc937e385a 100644
--- a/sys/coda/coda_subr.c
+++ b/sys/coda/coda_subr.c
@@ -62,7 +62,6 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>
diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c
index e1df0f8c050e..d19ef84a9e00 100644
--- a/sys/coda/coda_vfsops.c
+++ b/sys/coda/coda_vfsops.c
@@ -55,7 +55,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 
 #include <coda/coda.h>
 #include <coda/cnode.h>
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index 8fd7170d7fae..9dea336e9fb7 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -58,7 +58,6 @@
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c
index 49d9fd072e22..7014c89ba477 100644
--- a/sys/fs/coda/coda_psdev.c
+++ b/sys/fs/coda/coda_psdev.c
@@ -67,7 +67,6 @@ extern int coda_nc_initialized;    /* Set if cache has been initialized */
 #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 84546c17673b..21dc937e385a 100644
--- a/sys/fs/coda/coda_subr.c
+++ b/sys/fs/coda/coda_subr.c
@@ -62,7 +62,6 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
-#include <sys/socket.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 e1df0f8c050e..d19ef84a9e00 100644
--- a/sys/fs/coda/coda_vfsops.c
+++ b/sys/fs/coda/coda_vfsops.c
@@ -55,7 +55,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.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 8fd7170d7fae..9dea336e9fb7 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -58,7 +58,6 @@
 #include <sys/mutex.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/uio.h>
 
 #include <vm/vm.h>
diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c
index e970c5a9fa4d..34d766685bbf 100644
--- a/sys/fs/devfs/devfs_vfsops.c
+++ b/sys/fs/devfs/devfs_vfsops.c
@@ -44,7 +44,6 @@
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/vnode.h>
 
 #include <fs/devfs/devfs.h>
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index e8477b7edcc0..56e1e3bc8681 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
 
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index 11da21157dda..b9b34161014b 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -51,7 +51,6 @@
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
-#include <sys/socket.h>
 #include <sys/vnode.h>
 
 #include <fs/fdescfs/fdesc.h>
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index 6a9f897c3d31..7cd2feece507 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -54,7 +54,6 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
 
-- 
cgit v1.2.3