This commit was manufactured by cvs2svn to create tag

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

diff --git a/net/socket.c b/net/socket.c
index b5d42a2..ae9f18e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -94,6 +94,7 @@
 
 #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);
@@ -493,8 +494,6 @@ 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
@@ -1402,7 +1401,7 @@ asmlinkage long sys_accept(int fd, struct sockaddr __user *upeer_sockaddr, int _
        if (!sock)
                goto out;
 
-       err = -ENFILE;
+       err = -EMFILE;
        if (!(newsock = sock_alloc())) 
                goto out_put;
 
@@ -2182,6 +2181,7 @@ 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_GPL(sock_alloc);
 EXPORT_SYMBOL(sock_create);
 EXPORT_SYMBOL(sock_create_kern);
 EXPORT_SYMBOL(sock_create_lite);