Skip to content

Commit

Permalink
[SCSI] iscsi_tcp: remove sk_sleep check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Christie authored and James Bottomley committed May 25, 2010
1 parent 64ffdb7 commit 8c38a29
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/scsi/iscsi_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 8c38a29

Please sign in to comment.