Whamcloud - gitweb
LU-12678 socklnd: don't fall-back to tcp_sendpage. 34/39134/2
authorMr NeilBrown <neilb@suse.de>
Sun, 7 Jun 2020 23:24:23 +0000 (19:24 -0400)
committerOleg Drokin <green@whamcloud.com>
Sun, 28 Jun 2020 02:49:08 +0000 (02:49 +0000)
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 <neilb@suse.de>
Change-Id: Iaabf47790f2809fe98a0f09da31aa441021b26ab
Reviewed-on: https://review.whamcloud.com/39134
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lnet/klnds/socklnd/socklnd_lib.c

index 7d560df..375128c 100644 (file)
@@ -140,12 +140,8 @@ ksocknal_lib_send_kiov(struct ksock_conn *conn, struct ksock_tx *tx,
                    fragsize < tx->tx_resid)
                        msgflg |= MSG_MORE;
 
                    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;
        } else {
 #if SOCKNAL_SINGLE_FRAG_TX || !SOCKNAL_RISK_KMAP_DEADLOCK
                struct kvec     scratch;