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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sparc64
/
solaris
/
ioctl.c
diff --git
a/arch/sparc64/solaris/ioctl.c
b/arch/sparc64/solaris/ioctl.c
index
be0a054
..
330743c
100644
(file)
--- a/
arch/sparc64/solaris/ioctl.c
+++ b/
arch/sparc64/solaris/ioctl.c
@@
-299,8
+299,8
@@
static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
rcu_read_lock();
fdt = files_fdtable(current->files);
if (! fdt->fd[fd] ||
rcu_read_lock();
fdt = files_fdtable(current->files);
if (! fdt->fd[fd] ||
- ! fdt->fd[fd]->f_dentry ||
- ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||
+ ! fdt->fd[fd]->f_
path.
dentry ||
+ ! (ino = fdt->fd[fd]->f_
path.
dentry->d_inode) ||
! S_ISSOCK(ino->i_mode)) {
rcu_read_unlock();
return TBADF;
! S_ISSOCK(ino->i_mode)) {
rcu_read_unlock();
return TBADF;
@@
-480,7
+480,7
@@
static inline int solaris_S(struct file *filp, unsigned int fd, unsigned int cmd
struct sol_socket_struct *sock;
struct module_info *mi;
struct sol_socket_struct *sock;
struct module_info *mi;
- ino = filp->f_dentry->d_inode;
+ ino = filp->f_
path.
dentry->d_inode;
if (!S_ISSOCK(ino->i_mode))
return -EBADF;
sock = filp->private_data;
if (!S_ISSOCK(ino->i_mode))
return -EBADF;
sock = filp->private_data;