iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
813d08cb6d
linux/net/smc
History
Linus Torvalds 410da1e12f net/smc: fix up merge error with poll changes 
My networking merge (commit 4e33d7d479: "Pull networking fixes from
David Miller") got the poll() handling conflict wrong for af_smc.

The conflict between my a11e1d432b ("Revert changes to convert to
->poll_mask() and aio IOCB_CMD_POLL") and Ursula Braun's 24ac3a08e6
("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>
2018-07-03 09:53:43 -07:00
..
af_smc.c net/smc: fix up merge error with poll changes 2018-07-03 09:53:43 -07:00
Kconfig net/smc: remove Kconfig warning 2017-07-29 11:22:58 -07:00
Makefile smc: netlink interface for SMC sockets 2017-01-09 16:07:41 -05:00
smc_cdc.c net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_cdc.h net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_clc.c net/smc: rename connection index to RMBE index 2018-05-18 13:15:01 -04:00
smc_clc.h net/smc: rename connection index to RMBE index 2018-05-18 13:15:01 -04:00
smc_close.c net/smc: simplify wait when closing listen socket 2018-03-15 09:49:13 -04:00
smc_close.h net/smc: replace sock_put worker by socket refcounting 2018-01-26 10:41:56 -05:00
smc_core.c net/smc: longer delay when freeing client link groups 2018-05-23 16:02:35 -04:00
smc_core.h net/smc: move smc_core specific code from smc.h to smc_core 2018-05-18 13:15:01 -04:00
smc_diag.c net/smc: add common buffer size in send and receive buffer descriptors 2018-05-18 13:15:01 -04:00
smc_ib.c net/smc: move link group list to smc_core 2018-05-18 13:15:01 -04:00
smc_ib.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
smc_llc.c net/smc: drop messages when link state is inactive 2018-05-16 11:49:20 -04:00
smc_llc.h net/smc: use a workqueue to defer llc send 2018-05-16 11:49:19 -04:00
smc_pnet.c net/smc: check for missing nlattrs in SMC_PNETID messages 2018-05-14 16:40:45 -04:00
smc_pnet.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
smc_rx.c net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_rx.h smc: add support for splice() 2018-05-04 11:45:06 -04:00
smc_tx.c net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_tx.h net/smc: urgent data support 2018-05-23 16:02:35 -04:00
smc_wr.c treewide: kzalloc() -> kcalloc() 2018-06-12 16:19:22 -07:00
smc_wr.h net/smc: pay attention to MAX_ORDER for CQ entries 2018-03-14 13:40:44 -04:00
smc.h net/smc: rebuild nonblocking connect 2018-06-28 22:03:55 +09:00