Pull 5165 into release branch

[karo-tx-linux.git] / fs / cifs / cifsglob.h

diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
index 236de07cbda641d1cfdad4f4e6b3e16f079816ba..1ba08f8c5bc4aafac85cf3f83929391d6c633e17 100644 (file)
--- a/fs/cifs/cifsglob.h
+++ b/fs/cifs/cifsglob.h
@@ -123,13 +123,17 @@ struct TCP_Server_Info {
        struct list_head pending_mid_q;
        void *Server_NlsInfo;   /* BB - placeholder for future NLS info  */
        unsigned short server_codepage; /* codepage for the server    */
-       unsigned long ip_address;       /* IP addr for the server if known     */
+       unsigned long ip_address;       /* IP addr for the server if known */
        enum protocolEnum protocolType; 
        char versionMajor;
        char versionMinor;
        unsigned svlocal:1;     /* local server or remote */
        atomic_t socketUseCount; /* number of open cifs sessions on socket */
        atomic_t inFlight;  /* number of requests on the wire to server */
+#ifdef CONFIG_CIFS_STATS2
+       atomic_t inSend; /* requests trying to send */
+       atomic_t num_waiters;   /* blocked waiting to get in sendrecv */
+#endif
        enum statusEnum tcpStatus; /* what we think the status is */
        struct semaphore tcpSem;
        struct task_struct *tsk;
@@ -295,6 +299,7 @@ struct cifsFileInfo {
        struct inode * pInode; /* needed for oplock break */
        unsigned closePend:1;   /* file is marked to close */
        unsigned invalidHandle:1;  /* file closed via session abend */
+       atomic_t wrtPending;   /* handle in use - defer close */
        struct semaphore fh_sem; /* prevents reopen race after dead ses*/
        char * search_resume_name; /* BB removeme BB */
        unsigned int resume_name_length; /* BB removeme - field renamed and moved BB */
@@ -331,7 +336,7 @@ CIFS_SB(struct super_block *sb)
        return sb->s_fs_info;
 }
 
-static inline const char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
+static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
 {
        if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)
                return '/';
@@ -373,7 +378,11 @@ struct mid_q_entry {
        __u16 mid;              /* multiplex id */
        __u16 pid;              /* process id */
        __u32 sequence_number;  /* for CIFS signing */
-       struct timeval when_sent;       /* time when smb sent */
+       unsigned long when_alloc;  /* when mid was created */
+#ifdef CONFIG_CIFS_STATS2
+       unsigned long when_sent; /* time when smb send finished */
+       unsigned long when_received; /* when demux complete (taken off wire) */
+#endif
        struct cifsSesInfo *ses;        /* smb was sent to this server */
        struct task_struct *tsk;        /* task waiting for response */
        struct smb_hdr *resp_buf;       /* response buffer */
@@ -402,7 +411,7 @@ struct dir_notify_req {
        __u16 netfid;
        __u32 filter; /* CompletionFilter (for multishot) */
        int multishot;
-       struct file * dentry;
+       struct file * pfile;
 };
 
 #define   MID_FREE 0