Patch "pNFS: Don't clear the layout stateid if a layout return is outstanding" has been added to the 4.8-stable tree

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

pNFS: Don't clear the layout stateid if a layout return is outstanding

to the 4.8-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:
pnfs-don-t-clear-the-layout-stateid-if-a-layout-return-is-outstanding.patch
and it can be found in the queue-4.8 subdirectory.

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

From: Trond Myklebust <[email protected]>
Date: Mon, 14 Nov 2016 13:10:48 -0500
Subject: pNFS: Don't clear the layout stateid if a layout return is outstanding

From: Trond Myklebust <[email protected]>

commit 7b650994ab07434ae58a247dc9ac87d2488ca75c upstream.

If we no longer hold any layout segments, we're normally expected to consider the layout stateid to be invalid. However we cannot assume this if we're about to, or in the process of sending a layoutreturn.

---
 fs/nfs/pnfs.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -364,7 +364,9 @@ pnfs_layout_remove_lseg(struct pnfs_layo
 	list_del_init(&lseg->pls_list);
 	/* Matched by pnfs_get_layout_hdr in pnfs_layout_insert_lseg */
 	atomic_dec(&lo->plh_refcount);
-	if (list_empty(&lo->plh_segs)) {
+	if (list_empty(&lo->plh_segs) &&
+	    !test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags) &&
+	    !test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) {
 		if (atomic_read(&lo->plh_outstanding) == 0)
 			set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);
 		clear_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags);

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

queue-4.8/pnfs-fix-a-deadlock-between-read-resends-and-layoutreturn.patch queue-4.8/pnfs-don-t-clear-the-layout-stateid-if-a-layout-return-is-outstanding.patch queue-4.8/sunrpc-fix-refcounting-problems-with-auth_gss-messages.patch queue-4.8/pnfs-on-error-do-not-send-layoutget-until-the-layoutreturn-has-completed.patch queue-4.8/pnfs-clear-nfs_layout_return_requested-when-invalidating-the-layout-stateid.patch