Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / fs / cifs / connect.c

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index b7b8ef4..3dcf20b 100644 (file)
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -134,7 +134,6 @@ cifs_reconnect(struct TCP_Server_Info *server)
        server->session_key.response = NULL;
        server->session_key.len = 0;
        server->lstrp = jiffies;
        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);
 
        /* mark submitted MIDs for retry and issue callback */
        INIT_LIST_HEAD(&retry_list);


@@ -147,6 +146,7 @@ cifs_reconnect(struct TCP_Server_Info *server)
                list_move(&mid_entry->qhead, &retry_list);
        }
        spin_unlock(&GlobalMid_Lock);
                list_move(&mid_entry->qhead, &retry_list);
        }
        spin_unlock(&GlobalMid_Lock);

+       mutex_unlock(&server->srv_mutex);

 
        cFYI(1, "%s: issuing mid callbacks", __func__);
        list_for_each_safe(tmp, tmp2, &retry_list) {
 
        cFYI(1, "%s: issuing mid callbacks", __func__);
        list_for_each_safe(tmp, tmp2, &retry_list) {