From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Thu, 19 Jan 2023 21:33:34 +0000 (-0500)
Subject: NFS: Fix for xfstests generic/208
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=785207aa3d61ec1cb86e4441bff0a37c412ebd10;p=linux.git

NFS: Fix for xfstests generic/208

If the same page and data is being used for multiple requests,
then ignore that when the request indicates we're reading from the start
of the page.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index 16be6dae524f9..369e4553399a0 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -920,6 +920,9 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
 		req = nfs_list_entry(head->next);
 		nfs_list_move_request(req, &hdr->pages);
 
+		if (req->wb_pgbase == 0)
+			last_page = NULL;
+
 		if (!last_page || last_page != req->wb_page) {
 			pageused++;
 			if (pageused > pagecount)