Fixed parsing of mount options when doing DFS submount
[safe/jmp/linux-2.6] / fs / cifs / transport.c
index 981ea0d..ff8243a 100644 (file)
@@ -1,8 +1,9 @@
 /*
  *   fs/cifs/transport.c
  *
- *   Copyright (C) International Business Machines  Corp., 2002,2005
+ *   Copyright (C) International Business Machines  Corp., 2002,2008
  *   Author(s): Steve French (sfrench@us.ibm.com)
+ *   Jeremy Allison (jra@samba.org) 2006.
  *
  *   This library is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Lesser General Public License as published
@@ -16,7 +17,7 @@
  *
  *   You should have received a copy of the GNU Lesser General Public License
  *   along with this library; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
 #include <linux/fs.h>
 #include "cifsglob.h"
 #include "cifsproto.h"
 #include "cifs_debug.h"
-  
+
 extern mempool_t *cifs_mid_poolp;
-extern kmem_cache_t *cifs_oplock_cachep;
+extern struct kmem_cache *cifs_oplock_cachep;
 
 static struct mid_q_entry *
-AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
+AllocMidQEntry(const struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
 {
        struct mid_q_entry *temp;
 
@@ -48,13 +49,12 @@ AllocMidQEntry(struct smb_hdr *smb_buffer, struct cifsSesInfo *ses)
                cERROR(1, ("Null TCP session in AllocMidQEntry"));
                return NULL;
        }
-       
-       temp = (struct mid_q_entry *) mempool_alloc(cifs_mid_poolp,
-                                                   SLAB_KERNEL | SLAB_NOFS);
+
+       temp = mempool_alloc(cifs_mid_poolp, GFP_NOFS);
        if (temp == NULL)
                return temp;
        else {
-               memset(temp, 0, sizeof (struct mid_q_entry));
+               memset(temp, 0, sizeof(struct mid_q_entry));
                temp->mid = smb_buffer->Mid;    /* always LE */
                temp->pid = current->pid;
                temp->command = smb_buffer->Command;
@@ -85,7 +85,7 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
        list_del(&midEntry->qhead);
        atomic_dec(&midCount);
        spin_unlock(&GlobalMid_Lock);
-       if(midEntry->largeBuf)
+       if (midEntry->largeBuf)
                cifs_buf_release(midEntry->resp_buf);
        else
                cifs_small_buf_release(midEntry->resp_buf);
@@ -93,8 +93,8 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
        now = jiffies;
        /* commands taking longer than one second are indications that
           something is wrong, unless it is quite a slow link or server */
-       if((now - midEntry->when_alloc) > HZ) {
-               if((cifsFYI & CIFS_TIMER) && 
+       if ((now - midEntry->when_alloc) > HZ) {
+               if ((cifsFYI & CIFS_TIMER) &&
                   (midEntry->command != SMB_COM_LOCKING_ANDX)) {
                        printk(KERN_DEBUG " CIFS slow rsp: cmd %d mid %d",
                               midEntry->command, midEntry->mid);
@@ -109,15 +109,15 @@ DeleteMidQEntry(struct mid_q_entry *midEntry)
 }
 
 struct oplock_q_entry *
-AllocOplockQEntry(struct inode * pinode, __u16 fid, struct cifsTconInfo * tcon)
+AllocOplockQEntry(struct inode *pinode, __u16 fid, struct cifsTconInfo *tcon)
 {
        struct oplock_q_entry *temp;
-       if ((pinode== NULL) || (tcon == NULL)) {
+       if ((pinode == NULL) || (tcon == NULL)) {
                cERROR(1, ("Null parms passed to AllocOplockQEntry"));
                return NULL;
        }
        temp = (struct oplock_q_entry *) kmem_cache_alloc(cifs_oplock_cachep,
-                                                      SLAB_KERNEL);
+                                                      GFP_KERNEL);
        if (temp == NULL)
                return temp;
        else {
@@ -132,18 +132,36 @@ AllocOplockQEntry(struct inode * pinode, __u16 fid, struct cifsTconInfo * tcon)
 
 }
 
-void DeleteOplockQEntry(struct oplock_q_entry * oplockEntry)
+void DeleteOplockQEntry(struct oplock_q_entry *oplockEntry)
 {
-       spin_lock(&GlobalMid_Lock); 
+       spin_lock(&GlobalMid_Lock);
     /* should we check if list empty first? */
        list_del(&oplockEntry->qhead);
        spin_unlock(&GlobalMid_Lock);
        kmem_cache_free(cifs_oplock_cachep, oplockEntry);
 }
 
+
+void DeleteTconOplockQEntries(struct cifsTconInfo *tcon)
+{
+       struct oplock_q_entry *temp;
+
+       if (tcon == NULL)
+               return;
+
+       spin_lock(&GlobalMid_Lock);
+       list_for_each_entry(temp, &GlobalOplock_Q, qhead) {
+               if ((temp->tcon) && (temp->tcon == tcon)) {
+                       list_del(&temp->qhead);
+                       kmem_cache_free(cifs_oplock_cachep, temp);
+               }
+       }
+       spin_unlock(&GlobalMid_Lock);
+}
+
 int
 smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
-        unsigned int smb_buf_length, struct sockaddr *sin)
+        unsigned int smb_buf_length, struct sockaddr *sin, bool noblocksnd)
 {
        int rc = 0;
        int i = 0;
@@ -151,20 +169,23 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
        struct kvec iov;
        unsigned len = smb_buf_length + 4;
 
-       if(ssocket == NULL)
+       if (ssocket == NULL)
                return -ENOTSOCK; /* BB eventually add reconnect code here */
        iov.iov_base = smb_buffer;
        iov.iov_len = len;
 
        smb_msg.msg_name = sin;
-       smb_msg.msg_namelen = sizeof (struct sockaddr);
+       smb_msg.msg_namelen = sizeof(struct sockaddr);
        smb_msg.msg_control = NULL;
        smb_msg.msg_controllen = 0;
-       smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL; /* BB add more flags?*/
+       if (noblocksnd)
+               smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL;
+       else
+               smb_msg.msg_flags = MSG_NOSIGNAL;
 
        /* smb header is converted in header_assemble. bcc and rest of SMB word
-          area, and byte area if necessary, is converted to littleendian in 
-          cifssmb.c and RFC1001 len is converted to bigendian in smb_send 
+          area, and byte area if necessary, is converted to littleendian in
+          cifssmb.c and RFC1001 len is converted to bigendian in smb_send
           Flags2 is converted in SendReceive */
 
        smb_buffer->smb_buf_length = cpu_to_be32(smb_buffer->smb_buf_length);
@@ -176,9 +197,9 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
                if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
                        i++;
                /* smaller timeout here than send2 since smaller size */
-               /* Although it may not be required, this also is smaller 
-                  oplock break time */  
-                       if(i > 12) {
+               /* Although it may not be required, this also is smaller
+                  oplock break time */
+                       if (i > 12) {
                                cERROR(1,
                                   ("sends on sock %p stuck for 7 seconds",
                                    ssocket));
@@ -188,7 +209,7 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
                        msleep(1 << i);
                        continue;
                }
-               if (rc < 0) 
+               if (rc < 0)
                        break;
                else
                        i = 0; /* reset i after each successful send */
@@ -198,18 +219,21 @@ smb_send(struct socket *ssocket, struct smb_hdr *smb_buffer,
        }
 
        if (rc < 0) {
-               cERROR(1,("Error %d sending data on socket to server", rc));
+               cERROR(1, ("Error %d sending data on socket to server", rc));
        } else {
                rc = 0;
        }
 
+       /* Don't want to modify the buffer as a
+          side effect of this call. */
+       smb_buffer->smb_buf_length = smb_buf_length;
+
        return rc;
 }
 
-#ifdef CONFIG_CIFS_EXPERIMENTAL
 static int
-smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
-         struct sockaddr *sin)
+smb_send2(struct TCP_Server_Info *server, struct kvec *iov, int n_vec,
+         struct sockaddr *sin, bool noblocksnd)
 {
        int rc = 0;
        int i = 0;
@@ -218,19 +242,24 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
        unsigned int len = iov[0].iov_len;
        unsigned int total_len;
        int first_vec = 0;
-       
-       if(ssocket == NULL)
+       unsigned int smb_buf_length = smb_buffer->smb_buf_length;
+       struct socket *ssocket = server->ssocket;
+
+       if (ssocket == NULL)
                return -ENOTSOCK; /* BB eventually add reconnect code here */
 
        smb_msg.msg_name = sin;
-       smb_msg.msg_namelen = sizeof (struct sockaddr);
+       smb_msg.msg_namelen = sizeof(struct sockaddr);
        smb_msg.msg_control = NULL;
        smb_msg.msg_controllen = 0;
-       smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL; /* BB add more flags?*/
+       if (noblocksnd)
+               smb_msg.msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL;
+       else
+               smb_msg.msg_flags = MSG_NOSIGNAL;
 
        /* smb header is converted in header_assemble. bcc and rest of SMB word
-          area, and byte area if necessary, is converted to littleendian in 
-          cifssmb.c and RFC1001 len is converted to bigendian in smb_send 
+          area, and byte area if necessary, is converted to littleendian in
+          cifssmb.c and RFC1001 len is converted to bigendian in smb_send
           Flags2 is converted in SendReceive */
 
 
@@ -242,12 +271,13 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
        cFYI(1, ("Sending smb:  total_len %d", total_len));
        dump_smb(smb_buffer, len);
 
+       i = 0;
        while (total_len) {
                rc = kernel_sendmsg(ssocket, &smb_msg, &iov[first_vec],
                                    n_vec - first_vec, total_len);
                if ((rc == -ENOSPC) || (rc == -EAGAIN)) {
                        i++;
-                       if(i >= 14) {
+                       if (i >= 14) {
                                cERROR(1,
                                   ("sends on sock %p stuck for 15 seconds",
                                    ssocket));
@@ -257,17 +287,20 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
                        msleep(1 << i);
                        continue;
                }
-               if (rc < 0) 
+               if (rc < 0)
                        break;
 
-               if (rc >= total_len) {
-                       WARN_ON(rc > total_len);
+               if (rc == total_len) {
+                       total_len = 0;
+                       break;
+               } else if (rc > total_len) {
+                       cERROR(1, ("sent %d requested %d", rc, total_len));
                        break;
                }
-               if(rc == 0) {
+               if (rc == 0) {
                        /* should never happen, letting socket clear before
                           retrying is our only obvious option here */
-                       cERROR(1,("tcp sent no data"));
+                       cERROR(1, ("tcp sent no data"));
                        msleep(500);
                        continue;
                }
@@ -289,47 +322,37 @@ smb_send2(struct socket *ssocket, struct kvec *iov, int n_vec,
                i = 0; /* in case we get ENOSPC on the next send */
        }
 
+       if ((total_len > 0) && (total_len != smb_buf_length + 4)) {
+               cFYI(1, ("partial send (%d remaining), terminating session",
+                       total_len));
+               /* If we have only sent part of an SMB then the next SMB
+                  could be taken as the remainder of this one.  We need
+                  to kill the socket so the server throws away the partial
+                  SMB */
+               server->tcpStatus = CifsNeedReconnect;
+       }
+
        if (rc < 0) {
-               cERROR(1,("Error %d sending data on socket to server", rc));
+               cERROR(1, ("Error %d sending data on socket to server", rc));
        } else
                rc = 0;
 
+       /* Don't want to modify the buffer as a
+          side effect of this call. */
+       smb_buffer->smb_buf_length = smb_buf_length;
+
        return rc;
 }
 
-int
-SendReceive2(const unsigned int xid, struct cifsSesInfo *ses, 
-            struct kvec *iov, int n_vec, int *pbytes_returned,
-            const int long_op)
+static int wait_for_free_request(struct cifsSesInfo *ses, const int long_op)
 {
-       int rc = 0;
-       unsigned int receive_len;
-       unsigned long timeout;
-       struct mid_q_entry *midQ;
-       struct smb_hdr *in_buf = iov[0].iov_base;
-
-       if (ses == NULL) {
-               cERROR(1,("Null smb session"));
-               return -EIO;
-       }
-       if(ses->server == NULL) {
-               cERROR(1,("Null tcp session"));
-               return -EIO;
-       }
-
-       if(ses->server->tcpStatus == CifsExiting)
-               return -ENOENT;
-
-       /* Ensure that we do not send more than 50 overlapping requests 
-          to the same server. We may make this configurable later or
-          use ses->maxReq */
-       if(long_op == -1) {
+       if (long_op == CIFS_ASYNC_OP) {
                /* oplock breaks must not be held up */
                atomic_inc(&ses->server->inFlight);
        } else {
-               spin_lock(&GlobalMid_Lock); 
-               while(1) {        
-                       if(atomic_read(&ses->server->inFlight) >= 
+               spin_lock(&GlobalMid_Lock);
+               while (1) {
+                       if (atomic_read(&ses->server->inFlight) >=
                                        cifs_max_pending){
                                spin_unlock(&GlobalMid_Lock);
 #ifdef CONFIG_CIFS_STATS2
@@ -343,122 +366,229 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
 #endif
                                spin_lock(&GlobalMid_Lock);
                        } else {
-                               if(ses->server->tcpStatus == CifsExiting) {
+                               if (ses->server->tcpStatus == CifsExiting) {
                                        spin_unlock(&GlobalMid_Lock);
                                        return -ENOENT;
                                }
 
-                       /* can not count locking commands against total since
-                          they are allowed to block on server */
-                                       
-                               if(long_op < 3) {
+                               /* can not count locking commands against total
+                                  as they are allowed to block on server */
+
                                /* update # of requests on the wire to server */
+                               if (long_op != CIFS_BLOCKING_OP)
                                        atomic_inc(&ses->server->inFlight);
-                               }
                                spin_unlock(&GlobalMid_Lock);
                                break;
                        }
                }
        }
-       /* make sure that we sign in the same order that we send on this socket 
-          and avoid races inside tcp sendmsg code that could cause corruption
-          of smb data */
-
-       down(&ses->server->tcpSem); 
+       return 0;
+}
 
+static int allocate_mid(struct cifsSesInfo *ses, struct smb_hdr *in_buf,
+                       struct mid_q_entry **ppmidQ)
+{
        if (ses->server->tcpStatus == CifsExiting) {
-               rc = -ENOENT;
-               goto out_unlock2;
+               return -ENOENT;
        } else if (ses->server->tcpStatus == CifsNeedReconnect) {
-               cFYI(1,("tcp session dead - return to caller to retry"));
-               rc = -EAGAIN;
-               goto out_unlock2;
+               cFYI(1, ("tcp session dead - return to caller to retry"));
+               return -EAGAIN;
        } else if (ses->status != CifsGood) {
                /* check if SMB session is bad because we are setting it up */
-               if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && 
-                       (in_buf->Command != SMB_COM_NEGOTIATE)) {
-                       rc = -EAGAIN;
-                       goto out_unlock2;
-               } /* else ok - we are setting up session */
-       }
-       midQ = AllocMidQEntry(in_buf, ses);
-       if (midQ == NULL) {
-               up(&ses->server->tcpSem);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
+               if ((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) &&
+                       (in_buf->Command != SMB_COM_NEGOTIATE))
+                       return -EAGAIN;
+               /* else ok - we are setting up session */
+       }
+       *ppmidQ = AllocMidQEntry(in_buf, ses);
+       if (*ppmidQ == NULL)
                return -ENOMEM;
+       return 0;
+}
+
+static int wait_for_response(struct cifsSesInfo *ses,
+                       struct mid_q_entry *midQ,
+                       unsigned long timeout,
+                       unsigned long time_to_wait)
+{
+       unsigned long curr_timeout;
+
+       for (;;) {
+               curr_timeout = timeout + jiffies;
+               wait_event(ses->server->response_q,
+                       (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
+                       time_after(jiffies, curr_timeout) ||
+                       ((ses->server->tcpStatus != CifsGood) &&
+                        (ses->server->tcpStatus != CifsNew)));
+
+               if (time_after(jiffies, curr_timeout) &&
+                       (midQ->midState == MID_REQUEST_SUBMITTED) &&
+                       ((ses->server->tcpStatus == CifsGood) ||
+                        (ses->server->tcpStatus == CifsNew))) {
+
+                       unsigned long lrt;
+
+                       /* We timed out. Is the server still
+                          sending replies ? */
+                       spin_lock(&GlobalMid_Lock);
+                       lrt = ses->server->lstrp;
+                       spin_unlock(&GlobalMid_Lock);
+
+                       /* Calculate time_to_wait past last receive time.
+                        Although we prefer not to time out if the
+                        server is still responding - we will time
+                        out if the server takes more than 15 (or 45
+                        or 180) seconds to respond to this request
+                        and has not responded to any request from
+                        other threads on the client within 10 seconds */
+                       lrt += time_to_wait;
+                       if (time_after(jiffies, lrt)) {
+                               /* No replies for time_to_wait. */
+                               cERROR(1, ("server not responding"));
+                               return -1;
+                       }
+               } else {
+                       return 0;
+               }
+       }
+}
+
+
+/*
+ *
+ * Send an SMB Request.  No response info (other than return code)
+ * needs to be parsed.
+ *
+ * flags indicate the type of request buffer and how long to wait
+ * and whether to log NT STATUS code (error) before mapping it to POSIX error
+ *
+ */
+int
+SendReceiveNoRsp(const unsigned int xid, struct cifsSesInfo *ses,
+               struct smb_hdr *in_buf, int flags)
+{
+       int rc;
+       struct kvec iov[1];
+       int resp_buf_type;
+
+       iov[0].iov_base = (char *)in_buf;
+       iov[0].iov_len = in_buf->smb_buf_length + 4;
+       flags |= CIFS_NO_RESP;
+       rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags);
+       cFYI(DBG2, ("SendRcvNoRsp flags %d rc %d", flags, rc));
+
+       return rc;
+}
+
+int
+SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
+            struct kvec *iov, int n_vec, int *pRespBufType /* ret */,
+            const int flags)
+{
+       int rc = 0;
+       int long_op;
+       unsigned int receive_len;
+       unsigned long timeout;
+       struct mid_q_entry *midQ;
+       struct smb_hdr *in_buf = iov[0].iov_base;
+
+       long_op = flags & CIFS_TIMEOUT_MASK;
+
+       *pRespBufType = CIFS_NO_BUFFER;  /* no response buf yet */
+
+       if ((ses == NULL) || (ses->server == NULL)) {
+               cifs_small_buf_release(in_buf);
+               cERROR(1, ("Null session"));
+               return -EIO;
+       }
+
+       if (ses->server->tcpStatus == CifsExiting) {
+               cifs_small_buf_release(in_buf);
+               return -ENOENT;
+       }
+
+       /* Ensure that we do not send more than 50 overlapping requests
+          to the same server. We may make this configurable later or
+          use ses->maxReq */
+
+       rc = wait_for_free_request(ses, long_op);
+       if (rc) {
+               cifs_small_buf_release(in_buf);
+               return rc;
        }
 
-/* BB FIXME */
-/*     rc = cifs_sign_smb2(iov, n_vec, ses->server, &midQ->sequence_number); */
+       /* make sure that we sign in the same order that we send on this socket
+          and avoid races inside tcp sendmsg code that could cause corruption
+          of smb data */
+
+       down(&ses->server->tcpSem);
+
+       rc = allocate_mid(ses, in_buf, &midQ);
+       if (rc) {
+               up(&ses->server->tcpSem);
+               cifs_small_buf_release(in_buf);
+               /* Update # of requests on wire to server */
+               atomic_dec(&ses->server->inFlight);
+               wake_up(&ses->server->request_q);
+               return rc;
+       }
+       rc = cifs_sign_smb2(iov, n_vec, ses->server, &midQ->sequence_number);
 
        midQ->midState = MID_REQUEST_SUBMITTED;
 #ifdef CONFIG_CIFS_STATS2
        atomic_inc(&ses->server->inSend);
 #endif
-       rc = smb_send2(ses->server->ssocket, iov, n_vec,
-                     (struct sockaddr *) &(ses->server->addr.sockAddr));
+       rc = smb_send2(ses->server, iov, n_vec,
+                     (struct sockaddr *) &(ses->server->addr.sockAddr),
+                      ses->server->noblocksnd);
 #ifdef CONFIG_CIFS_STATS2
        atomic_dec(&ses->server->inSend);
        midQ->when_sent = jiffies;
 #endif
-       if(rc < 0) {
-               DeleteMidQEntry(midQ);
-               up(&ses->server->tcpSem);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
-               return rc;
-       } else
-               up(&ses->server->tcpSem);
-       if (long_op == -1)
-               goto cifs_no_response_exit2;
-       else if (long_op == 2) /* writes past end of file can take loong time */
+
+       up(&ses->server->tcpSem);
+       cifs_small_buf_release(in_buf);
+
+       if (rc < 0)
+               goto out;
+
+       if (long_op == CIFS_STD_OP)
+               timeout = 15 * HZ;
+       else if (long_op == CIFS_VLONG_OP) /* e.g. slow writes past EOF */
                timeout = 180 * HZ;
-       else if (long_op == 1)
-               timeout = 45 * HZ; /* should be greater than 
+       else if (long_op == CIFS_LONG_OP)
+               timeout = 45 * HZ; /* should be greater than
                        servers oplock break timeout (about 43 seconds) */
-       else if (long_op > 2) {
-               timeout = MAX_SCHEDULE_TIMEOUT;
-       } else
-               timeout = 15 * HZ;
-       /* wait for 15 seconds or until woken up due to response arriving or 
+       else if (long_op == CIFS_ASYNC_OP)
+               goto out;
+       else if (long_op == CIFS_BLOCKING_OP)
+               timeout = 0x7FFFFFFF; /*  large, but not so large as to wrap */
+       else {
+               cERROR(1, ("unknown timeout flag %d", long_op));
+               rc = -EIO;
+               goto out;
+       }
+
+       /* wait for 15 seconds or until woken up due to response arriving or
           due to last connection to this server being unmounted */
        if (signal_pending(current)) {
                /* if signal pending do not hold up user for full smb timeout
-               but we still give response a change to complete */
+               but we still give response a chance to complete */
                timeout = 2 * HZ;
-       }   
+       }
 
        /* No user interrupts in wait - wreaks havoc with performance */
-       if(timeout != MAX_SCHEDULE_TIMEOUT) {
-               timeout += jiffies;
-               wait_event(ses->server->response_q,
-                       (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
-                       time_after(jiffies, timeout) || 
-                       ((ses->server->tcpStatus != CifsGood) &&
-                        (ses->server->tcpStatus != CifsNew)));
-       } else {
-               wait_event(ses->server->response_q,
-                       (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
-                       ((ses->server->tcpStatus != CifsGood) &&
-                        (ses->server->tcpStatus != CifsNew)));
-       }
+       wait_for_response(ses, midQ, timeout, 10 * HZ);
 
        spin_lock(&GlobalMid_Lock);
        if (midQ->resp_buf) {
                spin_unlock(&GlobalMid_Lock);
                receive_len = midQ->resp_buf->smb_buf_length;
        } else {
-               cERROR(1,("No response to cmd %d mid %d",
+               cERROR(1, ("No response to cmd %d mid %d",
                        midQ->command, midQ->mid));
-               if(midQ->midState == MID_REQUEST_SUBMITTED) {
-                       if(ses->server->tcpStatus == CifsExiting)
+               if (midQ->midState == MID_REQUEST_SUBMITTED) {
+                       if (ses->server->tcpStatus == CifsExiting)
                                rc = -EHOSTDOWN;
                        else {
                                ses->server->tcpStatus = CifsNeedReconnect;
@@ -467,88 +597,77 @@ SendReceive2(const unsigned int xid, struct cifsSesInfo *ses,
                }
 
                if (rc != -EHOSTDOWN) {
-                       if(midQ->midState == MID_RETRY_NEEDED) {
+                       if (midQ->midState == MID_RETRY_NEEDED) {
                                rc = -EAGAIN;
-                               cFYI(1,("marking request for retry"));
+                               cFYI(1, ("marking request for retry"));
                        } else {
                                rc = -EIO;
                        }
                }
                spin_unlock(&GlobalMid_Lock);
                DeleteMidQEntry(midQ);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
+               /* Update # of requests on wire to server */
+               atomic_dec(&ses->server->inFlight);
+               wake_up(&ses->server->request_q);
                return rc;
        }
-  
+
        if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {
                cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",
                        receive_len, xid));
                rc = -EIO;
        } else {                /* rcvd frame is ok */
-
-               if (midQ->resp_buf && 
+               if (midQ->resp_buf &&
                        (midQ->midState == MID_RESPONSE_RECEIVED)) {
-                       in_buf->smb_buf_length = receive_len;
-                       /* BB verify that length would not overrun small buf */
-                       memcpy((char *)in_buf + 4,
-                              (char *)midQ->resp_buf + 4,
-                              receive_len);
 
-                       dump_smb(in_buf, 80);
+                       iov[0].iov_base = (char *)midQ->resp_buf;
+                       if (midQ->largeBuf)
+                               *pRespBufType = CIFS_LARGE_BUFFER;
+                       else
+                               *pRespBufType = CIFS_SMALL_BUFFER;
+                       iov[0].iov_len = receive_len + 4;
+
+                       dump_smb(midQ->resp_buf, 80);
                        /* convert the length into a more usable form */
-                       if((receive_len > 24) &&
+                       if ((receive_len > 24) &&
                           (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
                                        SECMODE_SIGN_ENABLED))) {
-                               rc = cifs_verify_signature(in_buf,
-                                               ses->server->mac_signing_key,
+                               rc = cifs_verify_signature(midQ->resp_buf,
+                                               &ses->server->mac_signing_key,
                                                midQ->sequence_number+1);
-                               if(rc) {
-                                       cERROR(1,("Unexpected SMB signature"));
+                               if (rc) {
+                                       cERROR(1, ("Unexpected SMB signature"));
                                        /* BB FIXME add code to kill session */
                                }
                        }
 
-                       *pbytes_returned = in_buf->smb_buf_length;
-
                        /* BB special case reconnect tid and uid here? */
-                       rc = map_smb_to_linux_error(in_buf);
+                       rc = map_smb_to_linux_error(midQ->resp_buf,
+                                               flags & CIFS_LOG_ERROR);
 
                        /* convert ByteCount if necessary */
-                       if (receive_len >=
-                           sizeof (struct smb_hdr) -
-                           4 /* do not count RFC1001 header */  +
-                           (2 * in_buf->WordCount) + 2 /* bcc */ )
-                               BCC(in_buf) = le16_to_cpu(BCC(in_buf));
+                       if (receive_len >= sizeof(struct smb_hdr) - 4
+                           /* do not count RFC1001 header */  +
+                           (2 * midQ->resp_buf->WordCount) + 2 /* bcc */ )
+                               BCC(midQ->resp_buf) =
+                                       le16_to_cpu(BCC_LE(midQ->resp_buf));
+                       if ((flags & CIFS_NO_RESP) == 0)
+                               midQ->resp_buf = NULL;  /* mark it so buf will
+                                                          not be freed by
+                                                          DeleteMidQEntry */
                } else {
                        rc = -EIO;
-                       cFYI(1,("Bad MID state?"));
+                       cFYI(1, ("Bad MID state?"));
                }
        }
-cifs_no_response_exit2:
-       DeleteMidQEntry(midQ);
-
-       if(long_op < 3) {
-               atomic_dec(&ses->server->inFlight); 
-               wake_up(&ses->server->request_q);
-       }
-
-       return rc;
 
-out_unlock2:
-       up(&ses->server->tcpSem);
-       /* If not lock req, update # of requests on wire to server */
-       if(long_op < 3) {
-               atomic_dec(&ses->server->inFlight); 
-               wake_up(&ses->server->request_q);
-       }
+out:
+       DeleteMidQEntry(midQ);
+       atomic_dec(&ses->server->inFlight);
+       wake_up(&ses->server->request_q);
 
        return rc;
 }
-#endif /* CIFS_EXPERIMENTAL */
 
 int
 SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
@@ -561,100 +680,48 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
        struct mid_q_entry *midQ;
 
        if (ses == NULL) {
-               cERROR(1,("Null smb session"));
+               cERROR(1, ("Null smb session"));
                return -EIO;
        }
-       if(ses->server == NULL) {
-               cERROR(1,("Null tcp session"));
+       if (ses->server == NULL) {
+               cERROR(1, ("Null tcp session"));
                return -EIO;
        }
 
-       if(ses->server->tcpStatus == CifsExiting)
+       if (ses->server->tcpStatus == CifsExiting)
                return -ENOENT;
 
-       /* Ensure that we do not send more than 50 overlapping requests 
+       /* Ensure that we do not send more than 50 overlapping requests
           to the same server. We may make this configurable later or
           use ses->maxReq */
-       if(long_op == -1) {
-               /* oplock breaks must not be held up */
-               atomic_inc(&ses->server->inFlight);
-       } else {
-               spin_lock(&GlobalMid_Lock); 
-               while(1) {        
-                       if(atomic_read(&ses->server->inFlight) >= 
-                                       cifs_max_pending){
-                               spin_unlock(&GlobalMid_Lock);
-#ifdef CONFIG_CIFS_STATS2
-                               atomic_inc(&ses->server->num_waiters);
-#endif
-                               wait_event(ses->server->request_q,
-                                       atomic_read(&ses->server->inFlight)
-                                        < cifs_max_pending);
-#ifdef CONFIG_CIFS_STATS2
-                               atomic_dec(&ses->server->num_waiters);
-#endif
-                               spin_lock(&GlobalMid_Lock);
-                       } else {
-                               if(ses->server->tcpStatus == CifsExiting) {
-                                       spin_unlock(&GlobalMid_Lock);
-                                       return -ENOENT;
-                               }
 
-                       /* can not count locking commands against total since
-                          they are allowed to block on server */
-                                       
-                               if(long_op < 3) {
-                               /* update # of requests on the wire to server */
-                                       atomic_inc(&ses->server->inFlight);
-                               }
-                               spin_unlock(&GlobalMid_Lock);
-                               break;
-                       }
-               }
-       }
-       /* make sure that we sign in the same order that we send on this socket 
+       rc = wait_for_free_request(ses, long_op);
+       if (rc)
+               return rc;
+
+       /* make sure that we sign in the same order that we send on this socket
           and avoid races inside tcp sendmsg code that could cause corruption
           of smb data */
 
-       down(&ses->server->tcpSem); 
+       down(&ses->server->tcpSem);
 
-       if (ses->server->tcpStatus == CifsExiting) {
-               rc = -ENOENT;
-               goto out_unlock;
-       } else if (ses->server->tcpStatus == CifsNeedReconnect) {
-               cFYI(1,("tcp session dead - return to caller to retry"));
-               rc = -EAGAIN;
-               goto out_unlock;
-       } else if (ses->status != CifsGood) {
-               /* check if SMB session is bad because we are setting it up */
-               if((in_buf->Command != SMB_COM_SESSION_SETUP_ANDX) && 
-                       (in_buf->Command != SMB_COM_NEGOTIATE)) {
-                       rc = -EAGAIN;
-                       goto out_unlock;
-               } /* else ok - we are setting up session */
-       }
-       midQ = AllocMidQEntry(in_buf, ses);
-       if (midQ == NULL) {
+       rc = allocate_mid(ses, in_buf, &midQ);
+       if (rc) {
                up(&ses->server->tcpSem);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
-               return -ENOMEM;
+               /* Update # of requests on wire to server */
+               atomic_dec(&ses->server->inFlight);
+               wake_up(&ses->server->request_q);
+               return rc;
        }
 
        if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) {
-               up(&ses->server->tcpSem);
-               cERROR(1,
-                      ("Illegal length, greater than maximum frame, %d ",
+               cERROR(1, ("Illegal length, greater than maximum frame, %d",
                        in_buf->smb_buf_length));
                DeleteMidQEntry(midQ);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
+               up(&ses->server->tcpSem);
+               /* Update # of requests on wire to server */
+               atomic_dec(&ses->server->inFlight);
+               wake_up(&ses->server->request_q);
                return -EIO;
        }
 
@@ -665,65 +732,54 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
        atomic_inc(&ses->server->inSend);
 #endif
        rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
-                     (struct sockaddr *) &(ses->server->addr.sockAddr));
+                     (struct sockaddr *) &(ses->server->addr.sockAddr),
+                     ses->server->noblocksnd);
 #ifdef CONFIG_CIFS_STATS2
        atomic_dec(&ses->server->inSend);
        midQ->when_sent = jiffies;
 #endif
-       if(rc < 0) {
-               DeleteMidQEntry(midQ);
-               up(&ses->server->tcpSem);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
-               return rc;
-       } else
-               up(&ses->server->tcpSem);
-       if (long_op == -1)
-               goto cifs_no_response_exit;
-       else if (long_op == 2) /* writes past end of file can take loong time */
-               timeout = 180 * HZ;
-       else if (long_op == 1)
-               timeout = 45 * HZ; /* should be greater than 
-                       servers oplock break timeout (about 43 seconds) */
-       else if (long_op > 2) {
-               timeout = MAX_SCHEDULE_TIMEOUT;
-       } else
+       up(&ses->server->tcpSem);
+
+       if (rc < 0)
+               goto out;
+
+       if (long_op == CIFS_STD_OP)
                timeout = 15 * HZ;
-       /* wait for 15 seconds or until woken up due to response arriving or 
+       /* wait for 15 seconds or until woken up due to response arriving or
           due to last connection to this server being unmounted */
+       else if (long_op == CIFS_ASYNC_OP)
+               goto out;
+       else if (long_op == CIFS_VLONG_OP) /* writes past EOF can be slow */
+               timeout = 180 * HZ;
+       else if (long_op == CIFS_LONG_OP)
+               timeout = 45 * HZ; /* should be greater than
+                       servers oplock break timeout (about 43 seconds) */
+       else if (long_op == CIFS_BLOCKING_OP)
+               timeout = 0x7FFFFFFF; /* large but no so large as to wrap */
+       else {
+               cERROR(1, ("unknown timeout flag %d", long_op));
+               rc = -EIO;
+               goto out;
+       }
+
        if (signal_pending(current)) {
                /* if signal pending do not hold up user for full smb timeout
-               but we still give response a change to complete */
+               but we still give response a chance to complete */
                timeout = 2 * HZ;
-       }   
+       }
 
        /* No user interrupts in wait - wreaks havoc with performance */
-       if(timeout != MAX_SCHEDULE_TIMEOUT) {
-               timeout += jiffies;
-               wait_event(ses->server->response_q,
-                       (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
-                       time_after(jiffies, timeout) || 
-                       ((ses->server->tcpStatus != CifsGood) &&
-                        (ses->server->tcpStatus != CifsNew)));
-       } else {
-               wait_event(ses->server->response_q,
-                       (!(midQ->midState & MID_REQUEST_SUBMITTED)) || 
-                       ((ses->server->tcpStatus != CifsGood) &&
-                        (ses->server->tcpStatus != CifsNew)));
-       }
+       wait_for_response(ses, midQ, timeout, 10 * HZ);
 
        spin_lock(&GlobalMid_Lock);
        if (midQ->resp_buf) {
                spin_unlock(&GlobalMid_Lock);
                receive_len = midQ->resp_buf->smb_buf_length;
        } else {
-               cERROR(1,("No response for cmd %d mid %d",
+               cERROR(1, ("No response for cmd %d mid %d",
                          midQ->command, midQ->mid));
-               if(midQ->midState == MID_REQUEST_SUBMITTED) {
-                       if(ses->server->tcpStatus == CifsExiting)
+               if (midQ->midState == MID_REQUEST_SUBMITTED) {
+                       if (ses->server->tcpStatus == CifsExiting)
                                rc = -EHOSTDOWN;
                        else {
                                ses->server->tcpStatus = CifsNeedReconnect;
@@ -732,23 +788,21 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
                }
 
                if (rc != -EHOSTDOWN) {
-                       if(midQ->midState == MID_RETRY_NEEDED) {
+                       if (midQ->midState == MID_RETRY_NEEDED) {
                                rc = -EAGAIN;
-                               cFYI(1,("marking request for retry"));
+                               cFYI(1, ("marking request for retry"));
                        } else {
                                rc = -EIO;
                        }
                }
                spin_unlock(&GlobalMid_Lock);
                DeleteMidQEntry(midQ);
-               /* If not lock req, update # of requests on wire to server */
-               if(long_op < 3) {
-                       atomic_dec(&ses->server->inFlight); 
-                       wake_up(&ses->server->request_q);
-               }
+               /* Update # of requests on wire to server */
+               atomic_dec(&ses->server->inFlight);
+               wake_up(&ses->server->request_q);
                return rc;
        }
-  
+
        if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {
                cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",
                        receive_len, xid));
@@ -764,14 +818,14 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
 
                        dump_smb(out_buf, 92);
                        /* convert the length into a more usable form */
-                       if((receive_len > 24) &&
+                       if ((receive_len > 24) &&
                           (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
                                        SECMODE_SIGN_ENABLED))) {
                                rc = cifs_verify_signature(out_buf,
-                                               ses->server->mac_signing_key,
+                                               &ses->server->mac_signing_key,
                                                midQ->sequence_number+1);
-                               if(rc) {
-                                       cERROR(1,("Unexpected SMB signature"));
+                               if (rc) {
+                                       cERROR(1, ("Unexpected SMB signature"));
                                        /* BB FIXME add code to kill session */
                                }
                        }
@@ -779,36 +833,265 @@ SendReceive(const unsigned int xid, struct cifsSesInfo *ses,
                        *pbytes_returned = out_buf->smb_buf_length;
 
                        /* BB special case reconnect tid and uid here? */
-                       rc = map_smb_to_linux_error(out_buf);
+                       rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
 
                        /* convert ByteCount if necessary */
-                       if (receive_len >=
-                           sizeof (struct smb_hdr) -
-                           4 /* do not count RFC1001 header */  +
+                       if (receive_len >= sizeof(struct smb_hdr) - 4
+                           /* do not count RFC1001 header */  +
                            (2 * out_buf->WordCount) + 2 /* bcc */ )
-                               BCC(out_buf) = le16_to_cpu(BCC(out_buf));
+                               BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
                } else {
                        rc = -EIO;
-                       cERROR(1,("Bad MID state? "));
+                       cERROR(1, ("Bad MID state?"));
                }
        }
-cifs_no_response_exit:
+
+out:
        DeleteMidQEntry(midQ);
+       atomic_dec(&ses->server->inFlight);
+       wake_up(&ses->server->request_q);
 
-       if(long_op < 3) {
-               atomic_dec(&ses->server->inFlight); 
-               wake_up(&ses->server->request_q);
-       }
+       return rc;
+}
+
+/* Send an NT_CANCEL SMB to cause the POSIX blocking lock to return. */
+
+static int
+send_nt_cancel(struct cifsTconInfo *tcon, struct smb_hdr *in_buf,
+               struct mid_q_entry *midQ)
+{
+       int rc = 0;
+       struct cifsSesInfo *ses = tcon->ses;
+       __u16 mid = in_buf->Mid;
 
+       header_assemble(in_buf, SMB_COM_NT_CANCEL, tcon, 0);
+       in_buf->Mid = mid;
+       down(&ses->server->tcpSem);
+       rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number);
+       if (rc) {
+               up(&ses->server->tcpSem);
+               return rc;
+       }
+       rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
+             (struct sockaddr *) &(ses->server->addr.sockAddr),
+             ses->server->noblocksnd);
+       up(&ses->server->tcpSem);
        return rc;
+}
+
+/* We send a LOCKINGX_CANCEL_LOCK to cause the Windows
+   blocking lock to return. */
+
+static int
+send_lock_cancel(const unsigned int xid, struct cifsTconInfo *tcon,
+                       struct smb_hdr *in_buf,
+                       struct smb_hdr *out_buf)
+{
+       int bytes_returned;
+       struct cifsSesInfo *ses = tcon->ses;
+       LOCK_REQ *pSMB = (LOCK_REQ *)in_buf;
+
+       /* We just modify the current in_buf to change
+          the type of lock from LOCKING_ANDX_SHARED_LOCK
+          or LOCKING_ANDX_EXCLUSIVE_LOCK to
+          LOCKING_ANDX_CANCEL_LOCK. */
+
+       pSMB->LockType = LOCKING_ANDX_CANCEL_LOCK|LOCKING_ANDX_LARGE_FILES;
+       pSMB->Timeout = 0;
+       pSMB->hdr.Mid = GetNextMid(ses->server);
+
+       return SendReceive(xid, ses, in_buf, out_buf,
+                       &bytes_returned, CIFS_STD_OP);
+}
+
+int
+SendReceiveBlockingLock(const unsigned int xid, struct cifsTconInfo *tcon,
+           struct smb_hdr *in_buf, struct smb_hdr *out_buf,
+           int *pbytes_returned)
+{
+       int rc = 0;
+       int rstart = 0;
+       unsigned int receive_len;
+       struct mid_q_entry *midQ;
+       struct cifsSesInfo *ses;
+
+       if (tcon == NULL || tcon->ses == NULL) {
+               cERROR(1, ("Null smb session"));
+               return -EIO;
+       }
+       ses = tcon->ses;
+
+       if (ses->server == NULL) {
+               cERROR(1, ("Null tcp session"));
+               return -EIO;
+       }
+
+       if (ses->server->tcpStatus == CifsExiting)
+               return -ENOENT;
+
+       /* Ensure that we do not send more than 50 overlapping requests
+          to the same server. We may make this configurable later or
+          use ses->maxReq */
+
+       rc = wait_for_free_request(ses, CIFS_BLOCKING_OP);
+       if (rc)
+               return rc;
+
+       /* make sure that we sign in the same order that we send on this socket
+          and avoid races inside tcp sendmsg code that could cause corruption
+          of smb data */
+
+       down(&ses->server->tcpSem);
+
+       rc = allocate_mid(ses, in_buf, &midQ);
+       if (rc) {
+               up(&ses->server->tcpSem);
+               return rc;
+       }
+
+       if (in_buf->smb_buf_length > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) {
+               up(&ses->server->tcpSem);
+               cERROR(1, ("Illegal length, greater than maximum frame, %d",
+                       in_buf->smb_buf_length));
+               DeleteMidQEntry(midQ);
+               return -EIO;
+       }
+
+       rc = cifs_sign_smb(in_buf, ses->server, &midQ->sequence_number);
 
-out_unlock:
+       midQ->midState = MID_REQUEST_SUBMITTED;
+#ifdef CONFIG_CIFS_STATS2
+       atomic_inc(&ses->server->inSend);
+#endif
+       rc = smb_send(ses->server->ssocket, in_buf, in_buf->smb_buf_length,
+                     (struct sockaddr *) &(ses->server->addr.sockAddr),
+                     ses->server->noblocksnd);
+#ifdef CONFIG_CIFS_STATS2
+       atomic_dec(&ses->server->inSend);
+       midQ->when_sent = jiffies;
+#endif
        up(&ses->server->tcpSem);
-       /* If not lock req, update # of requests on wire to server */
-       if(long_op < 3) {
-               atomic_dec(&ses->server->inFlight); 
-               wake_up(&ses->server->request_q);
+
+       if (rc < 0) {
+               DeleteMidQEntry(midQ);
+               return rc;
+       }
+
+       /* Wait for a reply - allow signals to interrupt. */
+       rc = wait_event_interruptible(ses->server->response_q,
+               (!(midQ->midState == MID_REQUEST_SUBMITTED)) ||
+               ((ses->server->tcpStatus != CifsGood) &&
+                (ses->server->tcpStatus != CifsNew)));
+
+       /* Were we interrupted by a signal ? */
+       if ((rc == -ERESTARTSYS) &&
+               (midQ->midState == MID_REQUEST_SUBMITTED) &&
+               ((ses->server->tcpStatus == CifsGood) ||
+                (ses->server->tcpStatus == CifsNew))) {
+
+               if (in_buf->Command == SMB_COM_TRANSACTION2) {
+                       /* POSIX lock. We send a NT_CANCEL SMB to cause the
+                          blocking lock to return. */
+
+                       rc = send_nt_cancel(tcon, in_buf, midQ);
+                       if (rc) {
+                               DeleteMidQEntry(midQ);
+                               return rc;
+                       }
+               } else {
+                       /* Windows lock. We send a LOCKINGX_CANCEL_LOCK
+                          to cause the blocking lock to return. */
+
+                       rc = send_lock_cancel(xid, tcon, in_buf, out_buf);
+
+                       /* If we get -ENOLCK back the lock may have
+                          already been removed. Don't exit in this case. */
+                       if (rc && rc != -ENOLCK) {
+                               DeleteMidQEntry(midQ);
+                               return rc;
+                       }
+               }
+
+               /* Wait 5 seconds for the response. */
+               if (wait_for_response(ses, midQ, 5 * HZ, 5 * HZ) == 0) {
+                       /* We got the response - restart system call. */
+                       rstart = 1;
+               }
+       }
+
+       spin_lock(&GlobalMid_Lock);
+       if (midQ->resp_buf) {
+               spin_unlock(&GlobalMid_Lock);
+               receive_len = midQ->resp_buf->smb_buf_length;
+       } else {
+               cERROR(1, ("No response for cmd %d mid %d",
+                         midQ->command, midQ->mid));
+               if (midQ->midState == MID_REQUEST_SUBMITTED) {
+                       if (ses->server->tcpStatus == CifsExiting)
+                               rc = -EHOSTDOWN;
+                       else {
+                               ses->server->tcpStatus = CifsNeedReconnect;
+                               midQ->midState = MID_RETRY_NEEDED;
+                       }
+               }
+
+               if (rc != -EHOSTDOWN) {
+                       if (midQ->midState == MID_RETRY_NEEDED) {
+                               rc = -EAGAIN;
+                               cFYI(1, ("marking request for retry"));
+                       } else {
+                               rc = -EIO;
+                       }
+               }
+               spin_unlock(&GlobalMid_Lock);
+               DeleteMidQEntry(midQ);
+               return rc;
        }
 
+       if (receive_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) {
+               cERROR(1, ("Frame too large received.  Length: %d  Xid: %d",
+                       receive_len, xid));
+               rc = -EIO;
+       } else {                /* rcvd frame is ok */
+
+               if (midQ->resp_buf && out_buf
+                   && (midQ->midState == MID_RESPONSE_RECEIVED)) {
+                       out_buf->smb_buf_length = receive_len;
+                       memcpy((char *)out_buf + 4,
+                              (char *)midQ->resp_buf + 4,
+                              receive_len);
+
+                       dump_smb(out_buf, 92);
+                       /* convert the length into a more usable form */
+                       if ((receive_len > 24) &&
+                          (ses->server->secMode & (SECMODE_SIGN_REQUIRED |
+                                       SECMODE_SIGN_ENABLED))) {
+                               rc = cifs_verify_signature(out_buf,
+                                               &ses->server->mac_signing_key,
+                                               midQ->sequence_number+1);
+                               if (rc) {
+                                       cERROR(1, ("Unexpected SMB signature"));
+                                       /* BB FIXME add code to kill session */
+                               }
+                       }
+
+                       *pbytes_returned = out_buf->smb_buf_length;
+
+                       /* BB special case reconnect tid and uid here? */
+                       rc = map_smb_to_linux_error(out_buf, 0 /* no log */ );
+
+                       /* convert ByteCount if necessary */
+                       if (receive_len >= sizeof(struct smb_hdr) - 4
+                           /* do not count RFC1001 header */  +
+                           (2 * out_buf->WordCount) + 2 /* bcc */ )
+                               BCC(out_buf) = le16_to_cpu(BCC_LE(out_buf));
+               } else {
+                       rc = -EIO;
+                       cERROR(1, ("Bad MID state?"));
+               }
+       }
+       DeleteMidQEntry(midQ);
+       if (rstart && rc == -EACCES)
+               return -ERESTARTSYS;
        return rc;
 }