X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fsmbfs%2Fsock.c;h=e48bd8235a8e39fd81231cb091ee570569d37b09;hb=efa7e8673c78cc6de2d6c367eb6f50449c57ed90;hp=6815b1b12b68853351a9af047031de63cfae7782;hpb=3cb904caa97f5c193df21b8cdf780a826564baff;p=linux-2.6

diff --git a/fs/smbfs/sock.c b/fs/smbfs/sock.c
index 6815b1b12b..e48bd8235a 100644
--- a/fs/smbfs/sock.c
+++ b/fs/smbfs/sock.c
@@ -17,7 +17,6 @@
 #include <linux/net.h>
 #include <linux/mm.h>
 #include <linux/netdevice.h>
-#include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 #include <net/scm.h>
 #include <net/tcp_states.h>
@@ -82,10 +81,10 @@ server_sock(struct smb_sb_info *server)
 	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
-		return SOCKET_I(file->f_dentry->d_inode);
+		return SOCKET_I(file->f_path.dentry->d_inode);
 	}
 	return NULL;
 }