From: Mike Christie <michaelc@cs.wisc.edu>
Date: Fri, 21 May 2010 23:24:16 +0000 (-0500)
Subject: [SCSI] iscsi_tcp: remove sk_sleep check
X-Git-Tag: v2.6.35-rc1~38^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c38a2951026e6b428d3ce6e518d123c35becd18;p=thirdparty%2Fkernel%2Flinux.git

[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>
---

diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index bf55d30574130..fec47de725359 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);