On Wed, Oct 07, 2015 at 01:54:42PM -0400, Trond Myklebust wrote: > If we're sending more pages via kernel_sendpage(), then set > MSG_SENDPAGE_NOTLAST. Given that we've survived without this a while, I assume this is a hint that may provide better performance in some cases (have you seen that?) and that it doesn't have to be 100% correct? In which case, looks fine, will queue up for 4.4.... --b. > > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > --- > net/sunrpc/svcsock.c | 2 +- > net/sunrpc/xprtsock.c | 4 +++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c > index 0c8120229a03..48923730722d 100644 > --- a/net/sunrpc/svcsock.c > +++ b/net/sunrpc/svcsock.c > @@ -181,7 +181,7 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr, > struct page **ppage = xdr->pages; > size_t base = xdr->page_base; > unsigned int pglen = xdr->page_len; > - unsigned int flags = MSG_MORE; > + unsigned int flags = MSG_MORE | MSG_SENDPAGE_NOTLAST; > int slen; > int len = 0; > > diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c > index 1471ecceabf9..e71aff251ac1 100644 > --- a/net/sunrpc/xprtsock.c > +++ b/net/sunrpc/xprtsock.c > @@ -360,8 +360,10 @@ static int xs_send_pagedata(struct socket *sock, struct xdr_buf *xdr, unsigned i > int flags = XS_SENDMSG_FLAGS; > > remainder -= len; > - if (remainder != 0 || more) > + if (more) > flags |= MSG_MORE; > + if (remainder != 0) > + flags |= MSG_SENDPAGE_NOTLAST | MSG_MORE; > err = do_sendpage(sock, *ppage, base, len, flags); > if (remainder == 0 || err != len) > break; > -- > 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
