cifs: fix wait_for_response to time out sleeping processes correctly

[linux-2.6-omap-h63xx.git] / fs / cifs / transport.c

diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
index cd4ed65d6cd96f07f08b3bf4bce76f66e95881f3..4d076be46d90eb190ca393bd6b02405faae10364 100644 (file)
--- a/fs/cifs/transport.c
+++ b/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) &&