git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
sparc64
/
solaris
/
timod.c
diff --git
a/arch/sparc64/solaris/timod.c
b/arch/sparc64/solaris/timod.c
index
24de506
..
022c80f
100644
(file)
--- a/
arch/sparc64/solaris/timod.c
+++ b/
arch/sparc64/solaris/timod.c
@@
-29,7
+29,7
@@
asmlinkage int solaris_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
asmlinkage int solaris_ioctl(unsigned int fd, unsigned int cmd, u32 arg);
-static
spinlock_t timod_pagelock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(timod_pagelock)
;
static char * page = NULL ;
#ifndef DEBUG_SOLARIS_KMALLOC
static char * page = NULL ;
#ifndef DEBUG_SOLARIS_KMALLOC
@@
-853,9
+853,7
@@
asmlinkage int solaris_getmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
if(!filp) goto out;
ino = filp->f_dentry->d_inode;
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);
goto out;
ctlptr = (struct strbuf __user *)A(arg1);
@@
-923,7
+921,7
@@
asmlinkage int solaris_putmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
ino = filp->f_dentry->d_inode;
if (!ino) goto out;
ino = filp->f_dentry->d_inode;
if (!ino) goto out;
- if (!
ino->i_sock
&&
+ if (!
S_ISSOCK(ino->i_mode)
&&
(imajor(ino) != 30 || iminor(ino) != 1))
goto out;
(imajor(ino) != 30 || iminor(ino) != 1))
goto out;