Skip to content

Commit c87dc4c

Browse files
author
Trond Myklebust
committed
SUNRPC: Further cleanups of xs_sendpages()
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 <[email protected]>
1 parent 0472e47 commit c87dc4c

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

net/sunrpc/xprtsock.c

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,10 +751,6 @@ static int xs_sendmsg(struct socket *sock, struct msghdr *msg, size_t seek)
751751

752752
static int xs_send_kvec(struct socket *sock, struct msghdr *msg, struct kvec *vec, size_t seek)
753753
{
754-
if (!vec) {
755-
iov_iter_kvec(&msg->msg_iter, WRITE, NULL, 0, 0);
756-
return sock_sendmsg(sock, msg);
757-
}
758754
iov_iter_kvec(&msg->msg_iter, WRITE, vec, 1, vec->iov_len);
759755
return xs_sendmsg(sock, msg, seek);
760756
}
@@ -797,12 +793,7 @@ static int xs_sendpages(struct socket *sock, struct sockaddr *addr, int addrlen,
797793
if (unlikely(!sock))
798794
return -ENOTSOCK;
799795

800-
if (base != 0) {
801-
addr = NULL;
802-
addrlen = 0;
803-
}
804-
805-
if (base < xdr->head[0].iov_len || addr != NULL) {
796+
if (base < xdr->head[0].iov_len) {
806797
unsigned int len = xdr->head[0].iov_len - base;
807798
remainder -= len;
808799
if (remainder == 0)

0 commit comments

Comments
 (0)