5 files changed, 42 insertions, 43 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 61f2dfd8fb1b..b6bedb008e0a 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -2164,12 +2164,12 @@ fildesc_drvinit(void *unused)
 	}
 }
 
-static fo_rdwr_t badfo_readwrite;
-static fo_ioctl_t badfo_ioctl;
-static fo_poll_t badfo_poll;
-static fo_kqfilter_t badfo_kqfilter;
-static fo_stat_t badfo_stat;
-static fo_close_t badfo_close;
+static fo_rdwr_t	badfo_readwrite;
+static fo_ioctl_t	badfo_ioctl;
+static fo_poll_t	badfo_poll;
+static fo_kqfilter_t	badfo_kqfilter;
+static fo_stat_t	badfo_stat;
+static fo_close_t	badfo_close;
 
 struct fileops badfileops = {
 	badfo_readwrite,
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 7bf8c7458c83..4c8e6d00fd93 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -58,13 +58,13 @@ static int	kqueue_scan(struct file *fp, int maxevents,
 		    struct thread *td);
 static void 	kqueue_wakeup(struct kqueue *kq);
 
-static fo_rdwr_t kqueue_read;
-static fo_rdwr_t kqueue_write;
-static fo_ioctl_t kqueue_ioctl;
-static fo_poll_t kqueue_poll;
-static fo_kqfilter_t kqueue_kqfilter;
-static fo_stat_t kqueue_stat;
-static fo_close_t kqueue_close;
+static fo_rdwr_t	kqueue_read;
+static fo_rdwr_t	kqueue_write;
+static fo_ioctl_t	kqueue_ioctl;
+static fo_poll_t	kqueue_poll;
+static fo_kqfilter_t	kqueue_kqfilter;
+static fo_stat_t	kqueue_stat;
+static fo_close_t	kqueue_close;
 
 static struct fileops kqueueops = {
 	kqueue_read,
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index bdf6cc323202..65d41e98d559 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -94,13 +94,13 @@
 /*
  * interfaces to the outside world
  */
-static fo_rdwr_t pipe_read;
-static fo_rdwr_t pipe_write;
-static fo_ioctl_t pipe_ioctl;
-static fo_poll_t pipe_poll;
-static fo_kqfilter_t pipe_kqfilter;
-static fo_stat_t pipe_stat;
-static fo_close_t pipe_close;
+static fo_rdwr_t	pipe_read;
+static fo_rdwr_t	pipe_write;
+static fo_ioctl_t	pipe_ioctl;
+static fo_poll_t	pipe_poll;
+static fo_kqfilter_t	pipe_kqfilter;
+static fo_stat_t	pipe_stat;
+static fo_close_t	pipe_close;
 
 static struct fileops pipeops = {
 	pipe_read, pipe_write, pipe_ioctl, pipe_poll, pipe_kqfilter,
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 74f4c23f5f56..01afcd9701a9 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -63,13 +63,13 @@
 
 #include <machine/limits.h>
 
-static fo_rdwr_t vn_read;
-static fo_rdwr_t vn_write;
-static fo_ioctl_t vn_ioctl;
-static fo_poll_t vn_poll;
-static fo_kqfilter_t vn_kqfilter;
-static fo_stat_t vn_statfile;
-static fo_close_t vn_closefile;
+static fo_rdwr_t	vn_read;
+static fo_rdwr_t	vn_write;
+static fo_ioctl_t	vn_ioctl;
+static fo_poll_t	vn_poll;
+static fo_kqfilter_t	vn_kqfilter;
+static fo_stat_t	vn_statfile;
+static fo_close_t	vn_closefile;
 
 struct 	fileops vnops = {
 	vn_read, vn_write, vn_ioctl, vn_poll, vn_kqfilter,
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 5161b83d5b64..722ceb668a40 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -150,6 +150,7 @@ LIST_HEAD(filelist, file);
 extern struct filelist filehead; /* (fl) head of list of open files */
 extern struct fileops vnops;
 extern struct fileops badfileops;
+extern struct fileops socketops;
 extern int maxfiles;		/* kernel limit on number of open files */
 extern int maxfilesperproc;	/* per process limit on number of open files */
 extern int nfiles;		/* (fl) actual number of open files */
@@ -166,14 +167,13 @@ int fdrop_locked(struct file *fp, struct thread *td);
  * XXX: This is wrong, they should go through the operations vector for
  * XXX: sockets instead of going directly for the individual functions. /phk
  */
-fo_rdwr_t soo_read;
-fo_rdwr_t soo_write;
-fo_ioctl_t soo_ioctl;
-fo_poll_t soo_poll;
-fo_kqfilter_t soo_kqfilter;
-fo_stat_t soo_stat;
-fo_close_t soo_close;
-extern	struct fileops socketops;
+fo_rdwr_t	soo_read;
+fo_rdwr_t	soo_write;
+fo_ioctl_t	soo_ioctl;
+fo_poll_t	soo_poll;
+fo_kqfilter_t	soo_kqfilter;
+fo_stat_t	soo_stat;
+fo_close_t	soo_close;
 
 /* Lock a file. */
 #define	FILE_LOCK(f)	mtx_lock((f)->f_mtxp)
@@ -201,14 +201,13 @@ void fputsock(struct socket *sp);
 		FILE_UNLOCK(fp);					\
 	} while (0)
 
-static __inline fo_rdwr_t fo_read;
-static __inline fo_rdwr_t fo_write;
-static __inline fo_ioctl_t fo_ioctl;
-static __inline fo_poll_t fo_poll;
-static __inline fo_kqfilter_t fo_kqfilter;
-static __inline fo_stat_t fo_stat;
-static __inline fo_close_t fo_close;
-struct proc;
+static __inline fo_rdwr_t	fo_read;
+static __inline fo_rdwr_t	fo_write;
+static __inline fo_ioctl_t	fo_ioctl;
+static __inline fo_poll_t	fo_poll;
+static __inline fo_kqfilter_t	fo_kqfilter;
+static __inline fo_stat_t	fo_stat;
+static __inline fo_close_t	fo_close;
 
 static __inline int
 fo_read(fp, uio, active_cred, flags, td)