Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 226453d8 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

SUNRPC: Use MSG_SENDPAGE_NOTLAST when calling sendpage() 



If we're sending more pages via kernel_sendpage(), then set
MSG_SENDPAGE_NOTLAST.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 0ad95472

net/sunrpc/svcsock.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr, 
	struct page	**ppage = xdr->pages;

	struct page	**ppage = xdr->pages;

	size_t		base = xdr->page_base;

	size_t		base = xdr->page_base;

	unsigned int	pglen = xdr->page_len;

	unsigned int	pglen = xdr->page_len;

	unsigned int	flags = MSG_MORE;

	unsigned int	flags = MSG_MORE | MSG_SENDPAGE_NOTLAST;

	int		slen;

	int		slen;

	int		len = 0;

	int		len = 0;

net/sunrpc/xprtsock.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -360,8 +360,10 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i 
		int flags = XS_SENDMSG_FLAGS;

		int flags = XS_SENDMSG_FLAGS;





		remainder -= len;

		remainder -= len;

		if (remainder != 0 || more)

		if (more)

			flags |= MSG_MORE;

			flags |= MSG_MORE;

		if (remainder != 0)

			flags |= MSG_SENDPAGE_NOTLAST | MSG_MORE;

		err = do_sendpage(sock, *ppage, base, len, flags);

		err = do_sendpage(sock, *ppage, base, len, flags);

		if (remainder == 0 || err != len)

		if (remainder == 0 || err != len)

			break;

			break;