From 011d760069142a740754fcd783d51e1290d113a9 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Sun, 7 Jun 2020 19:24:23 -0400 Subject: [PATCH 1/1] LU-12678 socklnd: don't fall-back to tcp_sendpage. sk_prot->sendpage is never NULL, so there is no need for a fallback to tcp_sendpage. Test-Parameters: trivial testlist=sanity-lnet Signed-off-by: Mr NeilBrown Change-Id: Iaabf47790f2809fe98a0f09da31aa441021b26ab Reviewed-on: https://review.whamcloud.com/39134 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- lnet/klnds/socklnd/socklnd_lib.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lnet/klnds/socklnd/socklnd_lib.c b/lnet/klnds/socklnd/socklnd_lib.c index 7d560df..375128c 100644 --- a/lnet/klnds/socklnd/socklnd_lib.c +++ b/lnet/klnds/socklnd/socklnd_lib.c @@ -140,12 +140,8 @@ ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx, fragsize < tx->tx_resid) msgflg |= MSG_MORE; - if (sk->sk_prot->sendpage != NULL) { - rc = sk->sk_prot->sendpage(sk, page, - offset, fragsize, msgflg); - } else { - rc = tcp_sendpage(sk, page, offset, fragsize, msgflg); - } + rc = sk->sk_prot->sendpage(sk, page, + offset, fragsize, msgflg); } else { #if SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_RISK_KMAP_DEADLOCK struct kvec scratch; -- 1.8.3.1