This is a note to let you know that I've just added the patch titled
NFS: Fix a bogus warning in nfs_generic_pgio
to the 3.17-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch
and it can be found in the queue-3.17 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b8fb9c30f25e45dab5d2cd310ab6913b6861d00f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Date: Mon, 13 Oct 2014 10:56:12 -0400
Subject: NFS: Fix a bogus warning in nfs_generic_pgio
From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
commit b8fb9c30f25e45dab5d2cd310ab6913b6861d00f 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: Steve Dickson <SteveD@xxxxxxxxxx>
Fixes: bba5c1887a92 (nfs: disallow duplicate pages in pgio page vectors)
Cc: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfs/pagelist.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -744,12 +744,11 @@ int nfs_generic_pgio(struct nfs_pageio_d
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))
Patches currently in stable-queue which might be from trond.myklebust@xxxxxxxxxxxxxxx are
queue-3.17/nfsv4.1-pnfs-replace-broken-pnfs_put_lseg_async.patch
queue-3.17/nfs-fix-an-uninitialised-pointer-oops-in-the-writeback-error-path.patch
queue-3.17/nfs-fix-duplicate-proc-entries.patch
queue-3.17/fixing-lease-renewal.patch
queue-3.17/nfsv4-fix-lock-recovery-when-create_session-setclientid_confirm-fails.patch
queue-3.17/nfsv4.1-fix-an-nfsv4.1-state-renewal-regression.patch
queue-3.17/nfs-fix-a-bogus-warning-in-nfs_generic_pgio.patch
queue-3.17/nfsv4-fix-open-lock-state-recovery-error-handling.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html