Merge with Linux 2.1.67.

1 files changed, 7 insertions, 2 deletions

diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h
index 72b805e60..4e277ad3c 100644
--- a/include/linux/smb_fs_sb.h
+++ b/include/linux/smb_fs_sb.h
@@ -13,13 +13,17 @@
 
 #include <linux/types.h>
 #include <linux/smb.h>
-#include <linux/smb_mount.h>
+
+/* Get the server for the specified dentry */
+#define server_from_dentry(dentry) &dentry->d_sb->u.smbfs_sb
+#define SB_of(server) ((struct super_block *) ((char *)(server) - \
+	(unsigned long)(&((struct super_block *)0)->u.smbfs_sb)))
 
 struct smb_sb_info {
         enum smb_conn_state state;
 	struct file * sock_file;
 
-        struct smb_mount_data m;
+        struct smb_mount_data *mnt;
 
 	/* Connections are counted. Each time a new socket arrives,
 	 * generation is incremented.
@@ -29,6 +33,7 @@ struct smb_sb_info {
 	struct smb_conn_opt opt;
 
 	struct semaphore sem;
+	struct wait_queue * wait;
 
 	__u32              packet_size;
 	unsigned char *    packet;