This commit was generated by cvs2svn to compensate for changes in r637,

[linux-2.6.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index e28ec6a..b5d42a2 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -94,7 +94,6 @@
 
 #include <net/sock.h>
 #include <linux/netfilter.h>
-#include <linux/vs_base.h>
 #include <linux/vs_socket.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
@@ -494,6 +493,8 @@ struct socket *sock_alloc(void)
        return sock;
 }
 
+EXPORT_SYMBOL_GPL(sock_alloc);
+
 /*
  *     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
@@ -1401,7 +1402,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
        if (!sock)
                goto out;
 
-       err = -EMFILE;
+       err = -ENFILE;
        if (!(newsock = sock_alloc())) 
                goto out_put;
 
@@ -2119,11 +2120,11 @@ void __init sock_init(void)
 int tux_Dprintk;
 int tux_TDprintk;
 
+struct module *tux_module = NULL;
+
 #ifdef CONFIG_TUX_MODULE
 
 asmlinkage long (*sys_tux_ptr) (unsigned int action, user_req_t *u_info) = NULL;
-
-struct module *tux_module = NULL;
 spinlock_t tux_module_lock = SPIN_LOCK_UNLOCKED;
 
 asmlinkage long sys_tux (unsigned int action, user_req_t *u_info)
@@ -2181,8 +2182,6 @@ void socket_seq_show(struct seq_file *seq)
 /* ABI emulation layers need these two */
 EXPORT_SYMBOL(move_addr_to_kernel);
 EXPORT_SYMBOL(move_addr_to_user);
-EXPORT_SYMBOL(sock_alloc);
-EXPORT_SYMBOL(sock_alloc_inode);
 EXPORT_SYMBOL(sock_create);
 EXPORT_SYMBOL(sock_create_kern);
 EXPORT_SYMBOL(sock_create_lite);