From fd39e07933709e50f24463ad74352f809ac39a1e Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Fri, 5 Dec 2008 20:41:21 -0500
Subject: [PATCH] --- yaml --- r: 121482 b: refs/heads/master c:
 85705524258f93a6086c3247a58f34a661b82b3d h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/fs/cifs/transport.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ef6a8b395937..4cdc01ec8c5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8be0ed44c2fa4afcf2c6d2fb3102c926e9f989df
+refs/heads/master: 85705524258f93a6086c3247a58f34a661b82b3d
diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index cd4ed65d6cd9..4d076be46d90 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/fs/cifs/transport.c
@@ -410,11 +410,8 @@ static int wait_for_response(struct cifsSesInfo *ses,
 
 	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)));
+		wait_event_timeout(ses->server->response_q,
+			midQ->midState != MID_REQUEST_SUBMITTED, timeout);
 
 		if (time_after(jiffies, curr_timeout) &&
 			(midQ->midState == MID_REQUEST_SUBMITTED) &&