Commit 4e6dea43 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman

NFS: Fix a bogus warning in nfs_generic_pgio

commit b8fb9c30 upstream.

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: default avatarSteve Dickson <SteveD@redhat.com>
Fixes: bba5c188 (nfs: disallow duplicate pages in pgio page vectors)
Cc: Weston Andros Adamson <dros@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db946bec
...@@ -754,12 +754,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc, ...@@ -754,12 +754,11 @@ int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
nfs_list_remove_request(req); nfs_list_remove_request(req);
nfs_list_add_request(req, &hdr->pages); 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) { if (!last_page || last_page != req->wb_page) {
*pages++ = last_page = req->wb_page;
pageused++; pageused++;
if (pageused > pagecount)
break;
*pages++ = last_page = req->wb_page;
} }
} }
if (WARN_ON_ONCE(pageused != pagecount)) if (WARN_ON_ONCE(pageused != pagecount))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment