diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-10-06 21:59:20 +0200 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-10-08 15:12:35 +0200 |
| commit | 31303d6cbb24ba94e8b82170213bd2fde6365d9a (patch) | |
| tree | e0fc66713ba0f5571bc48a13b382c11903074d76 /net/sunrpc | |
| parent | SUNRPC: Move AF_LOCAL receive data path into a workqueue context (diff) | |
| download | linux-31303d6cbb24ba94e8b82170213bd2fde6365d9a.tar.xz linux-31303d6cbb24ba94e8b82170213bd2fde6365d9a.zip | |
SUNRPC: Use MSG_SENDPAGE_NOTLAST in xs_send_pagedata()
If we're sending more than one page via kernel_sendpage(), then set
MSG_SENDPAGE_NOTLAST between the pages so that we don't send suboptimal
frames (see commit 2f5338442425 and commit 35f9c09fe9c7).
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; |