diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-05-21 18:24:16 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-05-25 10:04:10 -0500 |
| commit | 8c38a2951026e6b428d3ce6e518d123c35becd18 (patch) | |
| tree | e0dcbedc45b030f9ab8294d61eab45170a554329 | |
| parent | 64ffdb762241c0a9c0c8fac7ea92aa0ba1529334 (diff) | |
| download | linux-8c38a2951026e6b428d3ce6e518d123c35becd18.tar.gz linux-8c38a2951026e6b428d3ce6e518d123c35becd18.tar.bz2 linux-8c38a2951026e6b428d3ce6e518d123c35becd18.zip | |
[SCSI] iscsi_tcp: remove sk_sleep check
There is no need to call sk_sleep before calling wake_up_interruptible,
because the wait_queue_head is now with the socket.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
| -rw-r--r-- | drivers/scsi/iscsi_tcp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index bf55d3057413..fec47de72535 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/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); |