3 files changed, 0 insertions, 47 deletions

diff --git a/net/Makefile b/net/Makefile
index 7ed1970074b0..1f6c3e4b36d5 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -5,8 +5,6 @@
 # Rewritten to use lists instead of if-statements.
 #
 
-obj-y   := nonet.o
-
 obj-$(CONFIG_NET)               := socket.o core/
 
 tmp-$(CONFIG_COMPAT)            := compat.o
diff --git a/net/nonet.c b/net/nonet.c
deleted file mode 100644
index b1a73fda9c12..000000000000
--- a/net/nonet.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * net/nonet.c
- *
- * Dummy functions to allow us to configure network support entirely
- * out of the kernel.
- *
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) Matthew Wilcox 2003
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/fs.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-
-static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
-{
-        return -ENXIO;
-}
-
-const struct file_operations bad_sock_fops = {
-        .owner = THIS_MODULE,
-        .open = sock_no_open,
-        .llseek = noop_llseek,
-};
diff --git a/net/socket.c b/net/socket.c
index fe20c319a0bb..850f6c383342 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -113,7 +113,6 @@ unsigned int sysctl_net_busy_read __read_mostly;
 unsigned int sysctl_net_busy_poll __read_mostly;
 #endif
 
-static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
                          unsigned long nr_segs, loff_t pos);
 static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
@@ -151,7 +150,6 @@ static const struct file_operations socket_file_ops = {
         .compat_ioctl = compat_sock_ioctl,
 #endif
         .mmap =         sock_mmap,
-        .open =         sock_no_open,   /* special open code to disallow open via /proc */
         .release =      sock_close,
         .fasync =       sock_fasync,
         .sendpage =     sock_sendpage,
@@ -559,23 +557,6 @@ static struct socket *sock_alloc(void)
         return sock;
 }
 
-/*
- *      In theory you can't get an open on this inode, but /proc provides
- *      a back door. Remember to keep it shut otherwise you'll let the
- *      creepy crawlies in.
- */
-
-static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
-{
-        return -ENXIO;
-}
-
-const struct file_operations bad_sock_fops = {
-        .owner = THIS_MODULE,
-        .open = sock_no_open,
-        .llseek = noop_llseek,
-};
-
 /**
  *      sock_release    -       close a socket
  *      @sock: socket to close