vserver 1.9.5.x5

[linux-2.6.git] / arch / sparc64 / solaris / ioctl.c

diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index b0d1203..cac0a1c 100644 (file)
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -298,7 +298,7 @@ static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
        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 *filp, unsigned int fd, unsigned int cmd
         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) {