2 files changed, 5 insertions, 3 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 6ab9e83b899e..4fbd92d2e113 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -370,7 +370,6 @@ cifs_reconnect(struct TCP_Server_Info *server)
         server->session_key.response = NULL;
         server->session_key.len = 0;
         server->lstrp = jiffies;
-        mutex_unlock(&server->srv_mutex);
 
         /* mark submitted MIDs for retry and issue callback */
         INIT_LIST_HEAD(&retry_list);
@@ -383,6 +382,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
                 list_move(&mid_entry->qhead, &retry_list);
         }
         spin_unlock(&GlobalMid_Lock);
+        mutex_unlock(&server->srv_mutex);
 
         cifs_dbg(FYI, "%s: issuing mid callbacks\n", __func__);
         list_for_each_safe(tmp, tmp2, &retry_list) {
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index 2a24c524fb9a..87abe8ed074c 100644
--- a/fs/cifs/transport.c
+++ b/fs/cifs/transport.c
@@ -576,14 +576,16 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst,
         cifs_in_send_dec(server);
         cifs_save_when_sent(mid);
 
-        if (rc < 0)
+        if (rc < 0) {
                 server->sequence_number -= 2;
+                cifs_delete_mid(mid);
+        }
+
         mutex_unlock(&server->srv_mutex);
 
         if (rc == 0)
                 return 0;
 
-        cifs_delete_mid(mid);
         add_credits_and_wake_if(server, credits, optype);
         return rc;
 }