tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'nfsd-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Pull nfsd fix from Chuck Lever:
"Fix non-page-aligned NFS READs"

* tag 'nfsd-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
SUNRPC: Fix NFS READs that start at non-page-aligned offsets

Linus Torvalds 17fbcdf9 6157ce59

+4 -3
+4 -3
net/sunrpc/svcsock.c
··· 1113 1113 unsigned int offset, len, remaining; 1114 1114 struct bio_vec *bvec; 1115 1115 1116 - bvec = xdr->bvec; 1117 - offset = xdr->page_base; 1116 + bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT); 1117 + offset = offset_in_page(xdr->page_base); 1118 1118 remaining = xdr->page_len; 1119 1119 flags = MSG_MORE | MSG_SENDPAGE_NOTLAST; 1120 1120 while (remaining > 0) { 1121 1121 if (remaining <= PAGE_SIZE && tail->iov_len == 0) 1122 1122 flags = 0; 1123 - len = min(remaining, bvec->bv_len); 1123 + 1124 + len = min(remaining, bvec->bv_len - offset); 1124 1125 ret = kernel_sendpage(sock, bvec->bv_page, 1125 1126 bvec->bv_offset + offset, 1126 1127 len, flags);