[gentoo-commits] proj/linux-patches:5.10 commit in: /

[Alice Ferrazzi]

commit:     48021b103f4ba0eb61d3617182f0126b41f720a4
Author:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 10:20:37 2021 +0000
Commit:     Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 10:23:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=48021b10

Drop SUNRPC: Fix NFS READs that start at non-page-aligned offsets

Already added upstream

Signed-off-by: Alice Ferrazzi <alicef <AT> gentoo.org>

 0000_README                                        |  4 --
 ...RPC-NFS-fix-non-page-aligned-offsets-read.patch | 53 ----------------------
 2 files changed, 57 deletions(-)

diff --git a/0000_README b/0000_README
index 7d03d9d..9214e4d 100644
--- a/0000_README
+++ b/0000_README
@@ -115,10 +115,6 @@ Patch:  2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@××××××××.org/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
 
-Patch:  2400_SUNRPC-NFS-fix-non-page-aligned-offsets-read.patch
-From:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/net/sunrpc/svcsock.c?id=bad4c6eb5eaa8300e065bd4426727db5141d687d
-Desc:   SUNRPC: Fix NFS READs that start at non-page-aligned offsets
-
 Patch:  2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
 From:   https://bugs.gentoo.org/710790
 Desc:   tmp513 requies REGMAP_I2C to build.  Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino

diff --git a/2400_SUNRPC-NFS-fix-non-page-aligned-offsets-read.patch b/2400_SUNRPC-NFS-fix-non-page-aligned-offsets-read.patch
deleted file mode 100644
index 34d6ebb..0000000
--- a/2400_SUNRPC-NFS-fix-non-page-aligned-offsets-read.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From bad4c6eb5eaa8300e065bd4426727db5141d687d Mon Sep 17 00:00:00 2001
-From: Chuck Lever <chuck.lever@××××××.com>
-Date: Sun, 31 Jan 2021 16:16:23 -0500
-Subject: SUNRPC: Fix NFS READs that start at non-page-aligned offsets
-
-Anj Duvnjak reports that the Kodi.tv NFS client is not able to read
-video files from a v5.10.11 Linux NFS server.
-
-The new sendpage-based TCP sendto logic was not attentive to non-
-zero page_base values. nfsd_splice_read() sets that field when a
-READ payload starts in the middle of a page.
-
-The Linux NFS client rarely emits an NFS READ that is not page-
-aligned. All of my testing so far has been with Linux clients, so I
-missed this one.
-
-Reported-by: A. Duvnjak <avian@××××××××××××.net>
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211471
-Fixes: 4a85a6a3320b ("SUNRPC: Handle TCP socket sends with kernel_sendpage() again")
-Signed-off-by: Chuck Lever <chuck.lever@××××××.com>
-Tested-by: A. Duvnjak <avian@××××××××××××.net>
----
- net/sunrpc/svcsock.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-(limited to 'net/sunrpc/svcsock.c')
-
-diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
-index c9766d07eb81a..5a809c64dc7b9 100644
---- a/net/sunrpc/svcsock.c
-+++ b/net/sunrpc/svcsock.c
-@@ -1113,14 +1113,15 @@ static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg,
- 		unsigned int offset, len, remaining;
- 		struct bio_vec *bvec;
- 
--		bvec = xdr->bvec;
--		offset = xdr->page_base;
-+		bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT);
-+		offset = offset_in_page(xdr->page_base);
- 		remaining = xdr->page_len;
- 		flags = MSG_MORE | MSG_SENDPAGE_NOTLAST;
- 		while (remaining > 0) {
- 			if (remaining <= PAGE_SIZE && tail->iov_len == 0)
- 				flags = 0;
--			len = min(remaining, bvec->bv_len);
-+
-+			len = min(remaining, bvec->bv_len - offset);
- 			ret = kernel_sendpage(sock, bvec->bv_page,
- 					      bvec->bv_offset + offset,
- 					      len, flags);
--- 
-cgit 1.2.3-1.el7
-