On Fri, 16 Mar 2012 18:09:27 +0300
Pavel Shilovsky <piastry@xxxxxxxxxxx> wrote:
> to let us kill the proccess if it hangs waiting for a credit when
> the session is down and echo is disabled.
>
> Signed-off-by: Pavel Shilovsky <piastry@xxxxxxxxxxx>
> ---
> fs/cifs/transport.c | 7 ++++++-
> 1 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c
> index e8a4fd3..11787cc 100644
> --- a/fs/cifs/transport.c
> +++ b/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) {
Reviewed-by: Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
