diff --git a/[refs] b/[refs]
index 82c34a02ab73..941d6c7fe167 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbca9b2750e3b1ee6f56a616160ccfc12e8b161f
+refs/heads/master: 23bb80d2158cf4421fe239d788fd53cafb151050
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 4e396312f8d5..fc74930f1443 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -407,24 +407,11 @@ int sock_map_fd(struct socket *sock)
 
 static struct socket *sock_from_file(struct file *file, int *err)
 {
-	struct inode *inode;
-	struct socket *sock;
-
 	if (file->f_op == &socket_file_ops)
 		return file->private_data;	/* set in sock_map_fd */
 
-	inode = file->f_path.dentry->d_inode;
-	if (!S_ISSOCK(inode->i_mode)) {
-		*err = -ENOTSOCK;
-		return NULL;
-	}
-
-	sock = SOCKET_I(inode);
-	if (sock->file != file) {
-		printk(KERN_ERR "socki_lookup: socket file changed!\n");
-		sock->file = file;
-	}
-	return sock;
+	*err = -ENOTSOCK;
+	return NULL;
 }
 
 /**