Merge with Linux 2.1.55. More bugfixes and goodies from my private

CVS archive.

1 files changed, 17 insertions, 52 deletions

diff --git a/include/linux/smb_fs_sb.h b/include/linux/smb_fs_sb.h
index 863062022..72b805e60 100644
--- a/include/linux/smb_fs_sb.h
+++ b/include/linux/smb_fs_sb.h
@@ -2,76 +2,41 @@
  *  smb_fs_sb.h
  *
  *  Copyright (C) 1995 by Paal-Kr. Engstad and Volker Lendecke
+ *  Copyright (C) 1997 by Volker Lendecke
  *
  */
 
 #ifndef _SMB_FS_SB
 #define _SMB_FS_SB
 
+#ifdef __KERNEL__
+
+#include <linux/types.h>
 #include <linux/smb.h>
-#include <linux/smb_fs_i.h>
 #include <linux/smb_mount.h>
-#include <linux/types.h>
-
-#ifdef __KERNEL__
 
-struct smb_server {
-	enum smb_protocol  protocol;       /* The protocol this
-                                              connection accepts. */
-	enum smb_case_hndl case_handling;
-	struct file *      sock_file;	   /* The socket we transfer
-                                              data on. */
-	int                lock;       	   /* To prevent mismatch in
-                                              protocols. */
-	struct wait_queue *wait;
+struct smb_sb_info {
+        enum smb_conn_state state;
+	struct file * sock_file;
 
-	__u32              max_xmit;
-	char               hostname[256];
-	word               pid;
-	word               server_uid;
-	word               mid;
-	word               tid;
+        struct smb_mount_data m;
 
-        struct smb_mount_data m; /* We store the complete information here
-                                  * to be able to reconnect.
-                                  */
+	/* Connections are counted. Each time a new socket arrives,
+	 * generation is incremented.
+	 */
+	unsigned int generation;
+	pid_t conn_pid;
+	struct smb_conn_opt opt;
 
-        unsigned short     rcls; /* The error codes we received */
-        unsigned short     err;
+	struct semaphore sem;
 
 	__u32              packet_size;
 	unsigned char *    packet;
-
-        enum smb_conn_state state;
-        unsigned long reconnect_time; /* The time of the last attempt */
-
-        /* The following are LANMAN 1.0 options transferred to us in
-           SMBnegprot */
-        word   secmode;
-        word   maxmux;
-        word   maxvcs;
-        word   blkmode;
-        dword  sesskey;
+        unsigned short     rcls; /* The error codes we received */
+        unsigned short     err;
 
         /* We use our on data_ready callback, but need the original one */
         void *data_ready;
-
-        /* We do not have unique numbers for files in the smb protocol
-           like NFS-filehandles. (SMB was designed for DOS, not for
-           UNIX!) So we have to create our own inode numbers. We keep
-           a complete path of smb_inode_info's to each active
-           inode. The inode number is then created by the address of
-           this structure. */
-        struct smb_inode_info root;
-};
-
-/*
- * This is the part of the super-block (in memory) for the SMB file system.
- */
-
-struct smb_sb_info {
-	struct smb_server  s_server;
-	struct smb_dskattr s_attr;
 };
 
 #endif /* __KERNEL__ */