
Remove the last vestiges of i_sock

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

Index: linux/fs/inode.c
===================================================================
RCS file: /var/cvs/linux-2.6/fs/inode.c,v
retrieving revision 1.14
diff -u -p -r1.14 inode.c
--- linux/fs/inode.c	21 Oct 2004 18:59:38 -0000	1.14
+++ linux/fs/inode.c	19 Dec 2004 06:08:54 -0000
@@ -118,7 +118,6 @@ static struct inode *alloc_inode(struct 
 		inode->i_blkbits = sb->s_blocksize_bits;
 		inode->i_flags = 0;
 		atomic_set(&inode->i_count, 1);
-		inode->i_sock = 0;
 		inode->i_op = &empty_iops;
 		inode->i_fop = &empty_fops;
 		inode->i_nlink = 1;
Index: linux/include/linux/fs.h
===================================================================
RCS file: /var/cvs/linux-2.6/include/linux/fs.h,v
retrieving revision 1.23
diff -u -p -r1.23 fs.h
--- linux/include/linux/fs.h	29 Nov 2004 19:56:47 -0000	1.23
+++ linux/include/linux/fs.h	19 Dec 2004 06:08:55 -0000
@@ -446,7 +446,6 @@ struct inode {
 	unsigned long		i_version;
 	unsigned long		i_blocks;
 	unsigned short          i_bytes;
-	unsigned char		i_sock;
 	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
 	struct semaphore	i_sem;
 	struct rw_semaphore	i_alloc_sem;
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:08:55 -0000
@@ -471,7 +471,6 @@ static struct socket *sock_alloc(void)
 	sock = SOCKET_I(inode);
 
 	inode->i_mode = S_IFSOCK|S_IRWXUGO;
-	inode->i_sock = 1;
 	inode->i_uid = current->fsuid;
 	inode->i_gid = current->fsgid;
 
