
Remove references to i_sock in sparc64; use S_ISSOCK() instead.
Untested.

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

Index: linux/arch/sparc64/solaris/ioctl.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/sparc64/solaris/ioctl.c,v
retrieving revision 1.3
diff -u -p -r1.3 ioctl.c
--- linux/arch/sparc64/solaris/ioctl.c	13 Aug 2004 14:29:26 -0000	1.3
+++ linux/arch/sparc64/solaris/ioctl.c	19 Dec 2004 05:40:57 -0000
@@ -298,7 +298,7 @@ static inline int solaris_sockmod(unsign
 	if (! current->files->fd[fd] ||
 	    ! current->files->fd[fd]->f_dentry ||
 	    ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
-	    ! ino->i_sock) {
+	    ! S_ISSOCK(ino->i_mode)) {
 		spin_unlock(&current->files->file_lock);
 		return TBADF;
 	}
@@ -478,7 +478,7 @@ static inline int solaris_S(struct file 
         struct module_info *mi;
 
         ino = filp->f_dentry->d_inode;
-        if (! ino->i_sock)
+        if (!S_ISSOCK(ino->i_mode))
 		return -EBADF;
         sock = filp->private_data;
         if (! sock) {
Index: linux/arch/sparc64/solaris/socksys.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/sparc64/solaris/socksys.c,v
retrieving revision 1.3
diff -u -p -r1.3 socksys.c
--- linux/arch/sparc64/solaris/socksys.c	28 Feb 2004 01:50:26 -0000	1.3
+++ linux/arch/sparc64/solaris/socksys.c	19 Dec 2004 05:40:57 -0000
@@ -150,7 +150,7 @@ static unsigned int socksys_poll(struct 
 	unsigned int mask = 0;
 
 	ino=filp->f_dentry->d_inode;
-	if (ino && ino->i_sock) {
+	if (ino && S_ISSOCK(ino->i_mode)) {
 		struct sol_socket_struct *sock;
 		sock = (struct sol_socket_struct*)filp->private_data;
 		if (sock && sock->pfirst) {
Index: linux/arch/sparc64/solaris/timod.c
===================================================================
RCS file: /var/cvs/linux-2.6/arch/sparc64/solaris/timod.c,v
retrieving revision 1.5
diff -u -p -r1.5 timod.c
--- linux/arch/sparc64/solaris/timod.c	13 Aug 2004 14:29:26 -0000	1.5
+++ linux/arch/sparc64/solaris/timod.c	19 Dec 2004 05:40:57 -0000
@@ -853,9 +853,7 @@ asmlinkage int solaris_getmsg(unsigned i
 	if(!filp) goto out;
 
 	ino = filp->f_dentry->d_inode;
-	if (!ino) goto out;
-
-	if (!ino->i_sock)
+	if (!ino || !S_ISSOCK(ino->i_mode))
 		goto out;
 
 	ctlptr = (struct strbuf __user *)A(arg1);
@@ -923,7 +921,7 @@ asmlinkage int solaris_putmsg(unsigned i
 	ino = filp->f_dentry->d_inode;
 	if (!ino) goto out;
 
-	if (!ino->i_sock &&
+	if (!IS_SOCK(ino->i_mode) &&
 		(imajor(ino) != 30 || iminor(ino) != 1))
 		goto out;
 
