lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CIFS: Make wait_for_free_request killable

Browse Source 
to let us kill the proccess if it hangs waiting for a credit when
the session is down and echo is disabled.

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Pavel Shilovsky <piastry@etersoft.ru>
Signed-off-by: Steve French <sfrench@us.ibm.com>
This commit is contained in:
Pavel Shilovsky
2012-02-21 19:56:08 +03:00
committed by Steve French
parent 2d86dbc970
commit 5bc594982f
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/cifs/transport.c
View File

@@ -257,6 +257,8 @@ smb_send(struct TCP_Server_Info *server, struct smb_hdr *smb_buffer,
static int static int
wait_for_free_request(struct TCP_Server_Info *server, const int long_op) wait_for_free_request(struct TCP_Server_Info *server, const int long_op)
{ {
int rc;
spin_lock(&server->req_lock); spin_lock(&server->req_lock);
if (long_op == CIFS_ASYNC_OP) { 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) { if (server->credits <= 0) {
spin_unlock(&server->req_lock); spin_unlock(&server->req_lock);
cifs_num_waiters_inc(server); 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); cifs_num_waiters_dec(server);
if (rc)
return rc;
spin_lock(&server->req_lock); spin_lock(&server->req_lock);
} else { } else {
if (server->tcpStatus == CifsExiting) { if (server->tcpStatus == CifsExiting) {