Skip to content

Commit 1693185

Browse files
committed
Merge tag 'nfsd-6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever: - Fix new MSG_SPLICE_PAGES support in server's TCP sendmsg helper * tag 'nfsd-6.5-4' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg
2 parents 4853c74 + c96e2a6 commit 1693185

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/sunrpc/svcsock.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,9 @@ static int svc_tcp_sendmsg(struct socket *sock, struct xdr_buf *xdr,
12441244
if (ret != head->iov_len)
12451245
goto out;
12461246

1247+
if (xdr_buf_pagecount(xdr))
1248+
xdr->bvec[0].bv_offset = offset_in_page(xdr->page_base);
1249+
12471250
msg.msg_flags = MSG_SPLICE_PAGES;
12481251
iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, xdr->bvec,
12491252
xdr_buf_pagecount(xdr), xdr->page_len);

0 commit comments

Comments
 (0)