[Linux-cluster] sock_alloc 2.6.10 && gfs

["Svetoslav Slavtchev" <svetljo@xxxxxx>]

Hi guys,
it seems sock_alloc became static in 2.6.10
and i'm not sure how exactly to fix gfs
(
cluster/dlm/lowcomms.c:454
        memset(&peeraddr, 0, sizeof(peeraddr));
        newsock = sock_alloc();
        if (!newsock)
                return -ENOMEM;

)

do you think it'll be enough just to revert the change ?
(see attached diff )

best,

svetljo

-- 
+++ GMX - die erste Adresse für Mail, Message, More +++
1 GB Mailbox bereits in GMX FreeMail http://www.gmx.net/de/go/mail

diff -Nru a/include/linux/net.h b/include/linux/net.h
--- a/include/linux/net.h	2004-12-24 13:36:48 -08:00
+++ b/include/linux/net.h	2004-12-24 13:36:48 -08:00
@@ -176,6 +176,7 @@
 extern int	     sock_wake_async(struct socket *sk, int how, int band);
 extern int	     sock_register(struct net_proto_family *fam);
 extern int	     sock_unregister(int family);
+extern struct socket *sock_alloc(void);
 extern int	     sock_create(int family, int type, int proto,
 				 struct socket **res);
 extern int	     sock_create_kern(int family, int type, int proto,
diff -Nru a/net/socket.c b/net/socket.c
--- a/net/socket.c	2004-12-24 13:36:47 -08:00
+++ b/net/socket.c	2004-12-24 13:36:47 -08:00
@@ -459,7 +459,7 @@
  *	NULL is returned.
  */
 
-static struct socket *sock_alloc(void)
+struct socket *sock_alloc(void)
 {
 	struct inode * inode;
 	struct socket * sock;
@@ -2089,6 +2089,8 @@
 /* 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);