From 47adc368845399ff73b31e4c54905daa7427c7c8 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Fri, 21 May 2010 18:24:16 -0500 Subject: [PATCH] --- yaml --- r: 198983 b: refs/heads/master c: 8c38a2951026e6b428d3ce6e518d123c35becd18 h: refs/heads/master i: 198981: f724302871a0e4b35ecc0a17cc6b191c627bafe1 198979: fad1d7286d55dedc54e2f29d3843e853f3ffd6cc 198975: 30fdb7bb524743eb9a4b2c5a7d1f6a5f579152e8 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/iscsi_tcp.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 16dad2b9c365..e572f2ba0949 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64ffdb762241c0a9c0c8fac7ea92aa0ba1529334 +refs/heads/master: 8c38a2951026e6b428d3ce6e518d123c35becd18 diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c index bf55d3057413..fec47de72535 100644 --- a/trunk/drivers/scsi/iscsi_tcp.c +++ b/trunk/drivers/scsi/iscsi_tcp.c @@ -601,10 +601,8 @@ static void iscsi_sw_tcp_conn_stop(struct iscsi_cls_conn *cls_conn, int flag) set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx); write_unlock_bh(&tcp_sw_conn->sock->sk->sk_callback_lock); - if (sk_sleep(sock->sk)) { - sock->sk->sk_err = EIO; - wake_up_interruptible(sk_sleep(sock->sk)); - } + sock->sk->sk_err = EIO; + wake_up_interruptible(sk_sleep(sock->sk)); iscsi_conn_stop(cls_conn, flag); iscsi_sw_tcp_release_conn(conn);