Remove uses of i_sock from net/

Signed-off-by: Matthew Wilcox <matthew@wil.cx>

Index: linux/net/socket.c
===================================================================
RCS file: /var/cvs/linux-2.6/net/socket.c,v
retrieving revision 1.12
diff -u -p -r1.12 socket.c
--- linux/net/socket.c	29 Nov 2004 19:56:54 -0000	1.12
+++ linux/net/socket.c	19 Dec 2004 06:00:13 -0000
@@ -437,7 +437,7 @@ struct socket *sockfd_lookup(int fd, int
 	}
 
 	inode = file->f_dentry->d_inode;
-	if (!inode->i_sock || !(sock = SOCKET_I(inode)))
+	if (!S_ISSOCK(inode->i_mode) || !(sock = SOCKET_I(inode)))
 	{
 		*err = -ENOTSOCK;
 		fput(file);
Index: linux/net/netlink/af_netlink.c
===================================================================
RCS file: /var/cvs/linux-2.6/net/netlink/af_netlink.c,v
retrieving revision 1.16
diff -u -p -r1.16 af_netlink.c
--- linux/net/netlink/af_netlink.c	4 Dec 2004 07:03:12 -0000	1.16
+++ linux/net/netlink/af_netlink.c	19 Dec 2004 06:00:14 -0000
@@ -573,7 +573,7 @@ struct sock *netlink_getsockbyfilp(struc
 	struct socket *socket;
 	struct sock *sock;
 
-	if (!inode->i_sock || !(socket = SOCKET_I(inode)))
+	if (!S_ISSOCK(inode->i_mode) || !(socket = SOCKET_I(inode)))
 		return ERR_PTR(-ENOTSOCK);
 
 	sock = socket->sk;
Index: linux/net/unix/garbage.c
===================================================================
RCS file: /var/cvs/linux-2.6/net/unix/garbage.c,v
retrieving revision 1.1
diff -u -p -r1.1 garbage.c
--- linux/net/unix/garbage.c	29 Jul 2003 17:02:26 -0000	1.1
+++ linux/net/unix/garbage.c	19 Dec 2004 06:00:14 -0000
@@ -97,10 +97,7 @@ static struct sock *unix_get_socket(stru
 	struct sock *u_sock = NULL;
 	struct inode *inode = filp->f_dentry->d_inode;
 
-	/*
-	 *	Socket ?
-	 */
-	if (inode->i_sock) {
+	if (S_ISSOCK(inode->i_mode)) {
 		struct socket * sock = SOCKET_I(inode);
 		struct sock * s = sock->sk;