Fix networking tree iscsi_tcp.c mis-merge
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 16:48:36 +0000 (09:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 16:48:36 +0000 (09:48 -0700)
The removal of the 'waitqueue_active()' test in commit d7d05548a6
("[SCSI] iscsi_tcp: fix relogin/shutdown hang") got incorrectly resolved
by David when he back-merged the main git tree into the networking tree
in commit 278554bd65 ("Merge branch 'master' of master.kernel.org:...").

There was a content conflict due to 'sock->sk->sk_sleep' being changed
into 'sk_sleep(sock->sk)' in the networking tree, but David didn't pick
up the iscsi change from the main tree.

Reported-by: James Bottomley <James.Bottomley@suse.de>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/scsi/iscsi_tcp.c

index 7608310e19ee8437a35e3fba4213a18e7b99b1d5..bf55d305741306b0d35ef9584d942229e11152b4 100644 (file)
@@ -601,7 +601,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 (sk_sleep(sock->sk) && waitqueue_active(sk_sleep(sock->sk))) {
+       if (sk_sleep(sock->sk)) {
                sock->sk->sk_err = EIO;
                wake_up_interruptible(sk_sleep(sock->sk));
        }