NFS: Fix a bogus warning in nfs_generic_pgio

It is OK for pageused == pagecount in the loop, as long as we don't add another entry to the *pages array. Move the test so that it only triggers in that case. Reported-by: Steve Dickson <[email protected]> Fixes: bba5c18 (nfs: disallow duplicate pages in pgio page vectors) Cc: Weston Andros Adamson <[email protected]> Cc: [email protected] # 3.16.x Signed-off-by: Trond Myklebust <[email protected]>
chewitt · Oct 13, 2014 · b8fb9c3 · b8fb9c3
1 parent 3caa0c6
commit b8fb9c3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
@@ -752,12 +752,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
 		nfs_list_remove_request(req);
 		nfs_list_add_request(req, &hdr->pages);
 
-		if (WARN_ON_ONCE(pageused >= pagecount))
-			return nfs_pgio_error(desc, hdr);
-
 		if (!last_page || last_page != req->wb_page) {
-			*pages++ = last_page = req->wb_page;
 			pageused++;
+			if (pageused > pagecount)
+				break;
+			*pages++ = last_page = req->wb_page;
 		}
 	}
 	if (WARN_ON_ONCE(pageused != pagecount))