]> git.baikalelectronics.ru Git - kernel.git/commit
net/smc: fix up merge error with poll changes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2018 16:53:43 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2018 16:53:43 +0000 (09:53 -0700)
commit2b6c0dfab3a241b8e96af0f5ea6ec2ecae3e95e7
treea31418aa535c04f86aa4ac9a90185d322e58f364
parent7e2a8eb945f20e6a375e740babd8877a59feab02
net/smc: fix up merge error with poll changes

My networking merge (commit bcdc9af50f78: "Pull networking fixes from
David Miller") got the poll() handling conflict wrong for af_smc.

The conflict between my 637487354f8b ("Revert changes to convert to
->poll_mask() and aio IOCB_CMD_POLL") and Ursula Braun's 3b16206f1610
("net/smc: rebuild nonblocking connect") should have left the call to
sock_poll_wait() in place, just without the socket lock release/retake.

And I really should have realized that.  But happily, I at least asked
Ursula to double-check the merge, and she set me right.

This also fixes an incidental whitespace issue nearby that annoyed me
while looking at this.

Pointed-out-by: Ursula Braun <ubraun@linux.ibm.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
net/smc/af_smc.c