From f5bb3aa36729b0dac21a72845d97982b287a17fe Mon Sep 17 00:00:00 2001
From: Steve French <sfrench@us.ibm.com>
Date: Tue, 6 May 2008 22:27:16 +0000
Subject: [PATCH] --- yaml --- r: 96314 b: refs/heads/master c:
 cf432eb50ffd03572c08a006f44e0069957cf300 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ec48cfd22c3b..ec7425cd57bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dea570e08a69b14808b2cab56d6b0dda72145fa6
+refs/heads/master: cf432eb50ffd03572c08a006f44e0069957cf300
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index f2259db075c4..957998e8477e 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -49,8 +49,6 @@
 #define CIFS_PORT 445
 #define RFC1001_PORT 139
 
-static DECLARE_COMPLETION(cifsd_complete);
-
 extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
 			 unsigned char *p24);
 
@@ -356,7 +354,6 @@ cifs_demultiplex_thread(struct TCP_Server_Info *server)
 	atomic_inc(&tcpSesAllocCount);
 	length = tcpSesAllocCount.counter;
 	write_unlock(&GlobalSMBSeslock);
-	complete(&cifsd_complete);
 	if (length  > 1)
 		mempool_resize(cifs_req_poolp, length + cifs_min_rcv,
 				GFP_KERNEL);
@@ -1980,7 +1977,6 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
 				kfree(srvTcp->hostname);
 				goto out;
 			}
-			wait_for_completion(&cifsd_complete);
 			rc = 0;
 			memcpy(srvTcp->workstation_RFC1001_name,
 				volume_info.source_rfc1001_name, 16);
@@ -3553,8 +3549,6 @@ cifs_umount(struct super_block *sb, struct cifs_sb_info *cifs_sb)
 	cifs_sb->prepathlen = 0;
 	cifs_sb->prepath = NULL;
 	kfree(tmp);
-	if (ses)
-		schedule_timeout_interruptible(msecs_to_jiffies(500));
 	if (ses)
 		sesInfoFree(ses);