From a7aad2b96792bd09c887fba138a310b4b16fab41 Mon Sep 17 00:00:00 2001 From: Mike Christie Date: Wed, 31 Mar 2010 14:41:35 -0500 Subject: [PATCH] --- yaml --- r: 190119 b: refs/heads/master c: d7d05548a62c87ee55b0c81933669177f885aa8d h: refs/heads/master i: 190117: 4dd003b5178f58c899e219f76d954d52236bd731 190115: bda072527f904c014eafb1e970d699e4556bf32e 190111: f79e7ccef6a80dc9668113bfe5325a90ec91a353 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/iscsi_tcp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 156e366abf9a..9841b2b18222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc0beb44f27dc068c1daefc79826c07e0b22ef6c +refs/heads/master: d7d05548a62c87ee55b0c81933669177f885aa8d diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c index 0ee725ced511..02143af7c1af 100644 --- a/trunk/drivers/scsi/iscsi_tcp.c +++ b/trunk/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); }