Commit 70ca0a42 authored May 21, 2010 by Linus Torvalds

Fix networking tree iscsi_tcp.c mis-merge



The removal of the 'waitqueue_active()' test in commit d7d05548
("[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 278554bd ("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>

parent d7dbf4ff

drivers/scsi/iscsi_tcp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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));
		}

Admin message