Patch "NFS: nfs_set_pgio_error sometimes misses errors" has been added to the 3.10-stable tree

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

NFS: nfs_set_pgio_error sometimes misses errors

to the 3.10-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-nfs_set_pgio_error-sometimes-misses-errors.patch
and it can be found in the queue-3.10 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, 17 Aug 2015 12:57:07 -0500
Subject: NFS: nfs_set_pgio_error sometimes misses errors

From: Trond Myklebust <[email protected]>

commit e9ae58aeee8842a50f7e199d602a5ccb2e41a95f upstream.

We should ensure that we always set the pgio_header's error field if a READ or WRITE RPC call returns an error. The current code depends on 'hdr->good_bytes' always being initialised to a large value, which is not always done correctly by callers.
When this happens, applications may end up missing important errors.

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

@@ -60,8 +60,8 @@ EXPORT_SYMBOL_GPL(nfs_pgheader_init);
 void nfs_set_pgio_error(struct nfs_pgio_header *hdr, int error, loff_t pos)
 {
 	spin_lock(&hdr->lock);
-	if (pos < hdr->io_start + hdr->good_bytes) {
-		set_bit(NFS_IOHDR_ERROR, &hdr->flags);
+	if (!test_and_set_bit(NFS_IOHDR_ERROR, &hdr->flags)
+	    || pos < hdr->io_start + hdr->good_bytes) {
 		clear_bit(NFS_IOHDR_EOF, &hdr->flags);
 		hdr->good_bytes = pos - hdr->io_start;
 		hdr->error = error;

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

queue-3.10/nfs-nfs_set_pgio_error-sometimes-misses-errors.patch queue-3.10/nfs-fix-a-null-pointer-dereference-of-migration-recovery-ops-for-v4.2-client.patch queue-3.10/sunrpc-xs_reset_transport-must-mark-the-connection-as-disconnected.patch queue-3.10/nfsv4-don-t-set-setattr-for-o_rdonly-o_excl.patch