tree 454d9ef9cb4d545fa99ff1162542ee905d49f624
parent 4fb0dc97de1cd79399ab0c556f096d8db2bac278
author Karsten Graul <kgraul@linux.ibm.com> 1540294839 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1541339451 +0100

Revert "net: simplify sock_poll_wait"

[ Upstream commit 89ab066d4229acd32e323f1569833302544a4186 ]

This reverts commit dd979b4df817e9976f18fb6f9d134d6bc4a3c317.

This broke tcp_poll for SMC fallback: An AF_SMC socket establishes an
internal TCP socket for the initial handshake with the remote peer.
Whenever the SMC connection can not be established this TCP socket is
used as a fallback. All socket operations on the SMC socket are then
forwarded to the TCP socket. In case of poll, the file->private_data
pointer references the SMC socket because the TCP socket has no file
assigned. This causes tcp_poll to wait on the wrong socket.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>