Patch "NFS: Fix missing pg_cleanup after nfs_pageio_cond_complete()" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

NFS: Fix missing pg_cleanup after nfs_pageio_cond_complete()

to the 4.4-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-missing-pg_cleanup-after-nfs_pageio_cond_complete.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Benjamin Coddington <[email protected]>
Date: Fri, 14 Apr 2017 12:29:54 -0400
Subject: NFS: Fix missing pg_cleanup after nfs_pageio_cond_complete()

From: Benjamin Coddington <[email protected]>

[ Upstream commit 43b7d964ed30dbca5c83c90cb010985b429ec4f9 ]

Commit a7d42ddb3099727f58366fa006f850a219cce6c8 ("nfs: add mirroring support to pgio layer") moved pg_cleanup out of the path when there was non-sequental I/O that needed to be flushed. The result is that for layouts that have more than one layout segment per file, the pg_lseg is not cleared, so we can end up hitting the WARN_ON_ONCE(req_start >= seg_end) in pnfs_generic_pg_test since the pg_lseg will be pointing to that previously-flushed layout segment.

---
 fs/nfs/pagelist.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

@@ -1273,8 +1273,10 @@ void nfs_pageio_cond_complete(struct nfs
 		mirror = &desc->pg_mirrors[midx];
 		if (!list_empty(&mirror->pg_list)) {
 			prev = nfs_list_entry(mirror->pg_list.prev);
-			if (index != prev->wb_index + 1)
-				nfs_pageio_complete_mirror(desc, midx);
+			if (index != prev->wb_index + 1) {
+				nfs_pageio_complete(desc);
+				break;
+			}
 		}
 	}
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/nfsd4-permit-layoutget-of-executable-only-files.patch queue-4.4/nfs-fix-missing-pg_cleanup-after-nfs_pageio_cond_complete.patch