1 files changed, 2 insertions, 19 deletions

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 03ed8a09581c..8a9fded7c135 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -837,7 +837,6 @@ cifs_demultiplex_thread(void *p)
         struct TCP_Server_Info *server = p;
         unsigned int pdu_length;
         char *buf = NULL;
-        struct task_struct *task_to_wake = NULL;
         struct mid_q_entry *mid_entry;
 
         current->flags |= PF_MEMALLOC;
@@ -928,19 +927,7 @@ cifs_demultiplex_thread(void *p)
         if (server->smallbuf) /* no sense logging a debug message if NULL */
                 cifs_small_buf_release(server->smallbuf);
 
-        task_to_wake = xchg(&server->tsk, NULL);
         clean_demultiplex_info(server);
-
-        /* if server->tsk was NULL then wait for a signal before exiting */
-        if (!task_to_wake) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                while (!signal_pending(current)) {
-                        schedule();
-                        set_current_state(TASK_INTERRUPTIBLE);
-                }
-                set_current_state(TASK_RUNNING);
-        }
-
         module_put_and_exit(0);
 }
 
@@ -1600,6 +1587,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                         tmp_end++;
                         if (!(tmp_end < end && tmp_end[1] == delim)) {
                                 /* No it is not. Set the password to NULL */
+                                kfree(vol->password);
                                 vol->password = NULL;
                                 break;
                         }
@@ -1637,6 +1625,7 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
                                         options = end;
                         }
 
+                        kfree(vol->password);
                         /* Now build new password string */
                         temp_len = strlen(value);
                         vol->password = kzalloc(temp_len+1, GFP_KERNEL);
@@ -2061,8 +2050,6 @@ cifs_find_tcp_session(struct smb_vol *vol)
 static void
 cifs_put_tcp_session(struct TCP_Server_Info *server)
 {
-        struct task_struct *task;
-
         spin_lock(&cifs_tcp_ses_lock);
         if (--server->srv_count > 0) {
                 spin_unlock(&cifs_tcp_ses_lock);
@@ -2086,10 +2073,6 @@ cifs_put_tcp_session(struct TCP_Server_Info *server)
         kfree(server->session_key.response);
         server->session_key.response = NULL;
         server->session_key.len = 0;
-
-        task = xchg(&server->tsk, NULL);
-        if (task)
-                force_sig(SIGKILL, task);
 }
 
 static struct TCP_Server_Info *