diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-03-31 19:41:35 (GMT) |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-04-11 18:28:13 (GMT) |
| commit | d7d05548a62c87ee55b0c81933669177f885aa8d (patch) | |
| tree | 9c23e54b6e843a7eed97e96073c54348d609e95f /drivers | |
| parent | bc0beb44f27dc068c1daefc79826c07e0b22ef6c (diff) | |
| download | linux-fsl-qoriq-d7d05548a62c87ee55b0c81933669177f885aa8d.tar.xz | |
[SCSI] iscsi_tcp: fix relogin/shutdown hang
When I made this patch:
b64e77f70b8c11766e967e3485331a9e6ef01390
it was to solve a problem where we were already on the waitqueue
becuase a connection problem/logout caused us to be on there
when we were cleaning up the session. If we happen to get
on queue for more normal reasons like their just does not happen
to be any send space at the same time we are closing the connection
we hit a race and get stuck in the wait.
We should not check if the waitqueue is active
because we could race with the network code. If
the network xmit code is just about to enter the
prepare to wait when we check for the waitqueue to
be active then we will miss each other and the
network code will fall into the wait and we will
not run wake_up.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/iscsi_tcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 0ee725c..02143af 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -599,7 +599,7 @@ 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 (sock->sk->sk_sleep && waitqueue_active(sock->sk->sk_sleep)) { + if (sock->sk->sk_sleep) { sock->sk->sk_err = EIO; wake_up_interruptible(sock->sk->sk_sleep); } |