vserver 2.0 rc7

[linux-2.6.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 87e8b3d..81babab 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -1,7 +1,7 @@
 /*
  *   fs/cifs/cifsglob.h
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2003
+ *   Copyright (C) International Business Machines  Corp., 2002,2005
  *   Author(s): Steve French (sfrench@us.ibm.com)
  *
  *   This library is free software; you can redistribute it and/or modify
@@ -149,6 +149,8 @@ struct TCP_Server_Info {
        __u16 timeZone;
        char cryptKey[CIFS_CRYPTO_KEY_SIZE];
        char workstation_RFC1001_name[16]; /* 16th byte is always zero */
+       __u32 sequence_number; /* needed for CIFS PDU signature */
+       char mac_signing_key[CIFS_SESSION_KEY_SIZE + 16]; 
 };
 
 /*
@@ -174,20 +176,22 @@ struct cifsSesInfo {
        struct TCP_Server_Info *server; /* pointer to server info */
        atomic_t inUse; /* # of mounts (tree connections) on this ses */
        enum statusEnum status;
-       __u32 sequence_number;  /* needed for CIFS PDU signature */
        __u16 ipc_tid;          /* special tid for connection to IPC share */
-       char mac_signing_key[CIFS_SESSION_KEY_SIZE + 16];       
-       char *serverOS;         /* name of operating system underlying the server */
-       char *serverNOS;        /* name of network operating system that the server is running */
+       __u16 flags;
+       char *serverOS;         /* name of operating system underlying server */
+       char *serverNOS;        /* name of network operating system of server */
        char *serverDomain;     /* security realm of server */
        int Suid;               /* remote smb uid  */
        uid_t linux_uid;        /* local Linux uid */
        int capabilities;
-       char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for tcp names - will ipv6 and sctp addresses fit here?? */
+       char serverName[SERVER_NAME_LEN_WITH_NULL * 2]; /* BB make bigger for 
+                               TCP names - will ipv6 and sctp addresses fit? */
        char userName[MAX_USERNAME_SIZE + 1];
        char domainName[MAX_USERNAME_SIZE + 1];
        char * password;
 };
+/* session flags */
+#define CIFS_SES_NT4 1
 
 /*
  * there is one of these for each connection to a resource on a particular
@@ -309,12 +313,15 @@ struct mid_q_entry {
        __u16 mid;              /* multiplex id */
        __u16 pid;              /* process id */
        __u32 sequence_number;  /* for CIFS signing */
-       __u16 command;          /* smb command code */
        struct timeval when_sent;       /* time when smb sent */
        struct cifsSesInfo *ses;        /* smb was sent to this server */
        struct task_struct *tsk;        /* task waiting for response */
        struct smb_hdr *resp_buf;       /* response buffer */
        int midState;   /* wish this were enum but can not pass to wait_event */
+       __u8 command;   /* smb command code */
+       unsigned multiPart:1;   /* multiple responses to one SMB request */
+       unsigned largeBuf:1;    /* if valid response, is pointer to large buf */
+       unsigned multiResp:1;   /* multiple trans2 responses for one request  */
 };
 
 struct oplock_q_entry {