diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-10-07 13:54:42 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-10-23 15:57:27 -0400 |
| commit | 226453d8cfbd5f3bbdcef0d71e67186715bb811d (patch) | |
| tree | 8044b0b48d6c9872ef7f4aee1129bad75b3ac8aa | |
| parent | 0ad95472bf169a3501991f8f33f5147f792a8116 (diff) | |
| download | linux-226453d8cfbd5f3bbdcef0d71e67186715bb811d.tar.gz linux-226453d8cfbd5f3bbdcef0d71e67186715bb811d.tar.bz2 linux-226453d8cfbd5f3bbdcef0d71e67186715bb811d.zip | |
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: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | net/sunrpc/svcsock.c | 2 | ||||
| -rw-r--r-- | 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 1a85e0ed0b48..f264962a1d8a 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; |