From 0761c767993632f05255e8de512166e47e66612e Mon Sep 17 00:00:00 2001
From: Pavel Shilovsky <piastry@etersoft.ru>
Date: Tue, 21 Feb 2012 19:56:08 +0300
Subject: [PATCH] --- yaml --- r: 294588 b: refs/heads/master c:
 5bc594982f49220d33e927e3c9e028bf87b4745c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 269755b387e5..032020ef8a2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d86dbc97094ea4cfc2204fdefd7d07685496189
+refs/heads/master: 5bc594982f49220d33e927e3c9e028bf87b4745c
diff --git a/trunk/fs/cifs/transport.c b/trunk/fs/cifs/transport.c
index e5202ddef2fb..58b31da17fc5 100644
--- a/trunk/fs/cifs/transport.c
+++ b/trunk/fs/cifs/transport.c
@@ -257,6 +257,8 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,
 static int
 wait_for_free_request(struct TCP_Server_Info *server, const int long_op)
 {
+	int rc;
+
 	spin_lock(&server->req_lock);
 
 	if (long_op == CIFS_ASYNC_OP) {
@@ -271,8 +273,11 @@ wait_for_free_request(struct TCP_Server_Info *server, const int long_op)
 		if (server->credits <= 0) {
 			spin_unlock(&server->req_lock);
 			cifs_num_waiters_inc(server);
-			wait_event(server->request_q, has_credits(server));
+			rc = wait_event_killable(server->request_q,
+						 has_credits(server));
 			cifs_num_waiters_dec(server);
+			if (rc)
+				return rc;
 			spin_lock(&server->req_lock);
 		} else {
 			if (server->tcpStatus == CifsExiting) {