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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
smbfs
/
sock.c
diff --git
a/fs/smbfs/sock.c
b/fs/smbfs/sock.c
index
6815b1b
..
92ea6b2
100644
(file)
--- a/
fs/smbfs/sock.c
+++ b/
fs/smbfs/sock.c
@@
-82,10
+82,10
@@
server_sock(struct smb_sb_info *server)
if (server && (file = server->sock_file))
{
#ifdef SMBFS_PARANOIA
if (server && (file = server->sock_file))
{
#ifdef SMBFS_PARANOIA
- if (!smb_valid_socket(file->f_dentry->d_inode))
+ if (!smb_valid_socket(file->f_
path.
dentry->d_inode))
PARANOIA("bad socket!\n");
#endif
PARANOIA("bad socket!\n");
#endif
- return SOCKET_I(file->f_dentry->d_inode);
+ return SOCKET_I(file->f_
path.
dentry->d_inode);
}
return NULL;
}
}
return NULL;
}