GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 15:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SUNRPC: Further cleanups of xs_sendpages()

Browse source 
Now that we send the pages using a struct msghdr, instead of
using sendpage(), we no longer need to 'prime the socket' with
an address for unconnected UDP messages.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-02-19 13:13:40 -05:00
parent 0472e47660
commit c87dc4c73b
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/sunrpc/xprtsock.c
View file

@ -751,10 +751,6 @@ static int xs_sendmsg(struct socket *sock, struct msghdr *msg, size_t seek)
static int xs_send_kvec(struct socket *sock, struct msghdr *msg, struct kvec *vec, size_t seek) static int xs_send_kvec(struct socket *sock, struct msghdr *msg, struct kvec *vec, size_t seek)
{ {
if (!vec) {
iov_iter_kvec(&msg->msg_iter, WRITE, NULL, 0, 0);
return sock_sendmsg(sock, msg);
}
iov_iter_kvec(&msg->msg_iter, WRITE, vec, 1, vec->iov_len); iov_iter_kvec(&msg->msg_iter, WRITE, vec, 1, vec->iov_len);
return xs_sendmsg(sock, msg, seek); return xs_sendmsg(sock, msg, seek);
} }
@ -797,12 +793,7 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,
if (unlikely(!sock)) if (unlikely(!sock))
return -ENOTSOCK; return -ENOTSOCK;
if (base != 0) { if (base < xdr->head[0].iov_len) {
addr = NULL;
addrlen = 0;
}
if (base < xdr->head[0].iov_len || addr != NULL) {
unsigned int len = xdr->head[0].iov_len - base; unsigned int len = xdr->head[0].iov_len - base;
remainder -= len; remainder -= len;
if (remainder == 0) if (remainder == 0)