Patch "pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn" 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

pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn

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:
pnfs-flexfiles-fix-an-xdr-encoding-bug-in-layoutreturn.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: Trond Myklebust <[email protected]>
Date: Thu, 21 Jan 2016 15:39:40 -0500
Subject: pNFS/flexfiles: Fix an XDR encoding bug in layoutreturn

From: Trond Myklebust <[email protected]>

commit 082fa37d1351a41afc491d44a1d095cb8d919aa2 upstream.

We must not skip encoding the statistics, or the server will see an XDR encoding error.

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

@@ -1859,11 +1859,9 @@ ff_layout_encode_layoutreturn(struct pnf
 	start = xdr_reserve_space(xdr, 4);
 	BUG_ON(!start);
 
-	if (ff_layout_encode_ioerr(flo, xdr, args))
-		goto out;
-
+	ff_layout_encode_ioerr(flo, xdr, args);
 	ff_layout_encode_iostats(flo, xdr, args);
-out:
+
 	*start = cpu_to_be32((xdr->p - start - 1) * 4);
 	dprintk("%s: Return\n", __func__);
 }

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

queue-4.4/pnfs-flexfiles-fix-an-oopsable-typo-in-ff_mirror_match_fh.patch queue-4.4/sunrpc-fixup-socket-wait-for-memory.patch queue-4.4/nfs-fix-attribute-cache-revalidation.patch queue-4.4/nfs-fix-race-in-__update_open_stateid.patch queue-4.4/pnfs-flexfiles-fix-an-xdr-encoding-bug-in-layoutreturn.patch