Patch "NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes" has been added to the 4.1-stable tree

[<gregkh@linuxfoundation.org>]

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

    NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes

to the 4.1-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-ensure-we-set-nfs_context_resend_writes-when-requeuing-writes.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From c70701131f7a8edea91fc49d11796d342cff7c62 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Wed, 17 Jun 2015 19:56:22 -0400
Subject: NFS: Ensure we set NFS_CONTEXT_RESEND_WRITES when requeuing writes

From: Trond Myklebust <trond.myklebust@primarydata.com>

commit c70701131f7a8edea91fc49d11796d342cff7c62 upstream.

If a write attempt fails, and the write is queued up for resending to
the server, as opposed to being dropped, then we need to set the
appropriate flag so that nfs_file_fsync() does the right thing.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/nfs/pnfs.c  |    1 +
 fs/nfs/write.c |    1 +
 2 files changed, 2 insertions(+)

--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1821,6 +1821,7 @@ int pnfs_write_done_resend_to_mds(struct
 	/* Resend all requests through the MDS */
 	nfs_pageio_init_write(&pgio, hdr->inode, FLUSH_STABLE, true,
 			      hdr->completion_ops);
+	set_bit(NFS_CONTEXT_RESEND_WRITES, &hdr->args.context->flags);
 	return nfs_pageio_resend(&pgio, hdr);
 }
 EXPORT_SYMBOL_GPL(pnfs_write_done_resend_to_mds);
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1289,6 +1289,7 @@ static void nfs_initiate_write(struct nf
 static void nfs_redirty_request(struct nfs_page *req)
 {
 	nfs_mark_request_dirty(req);
+	set_bit(NFS_CONTEXT_RESEND_WRITES, &req->wb_context->flags);
 	nfs_unlock_request(req);
 	nfs_end_page_writeback(req);
 	nfs_release_request(req);


Patches currently in stable-queue which might be from trond.myklebust@primarydata.com are

queue-4.1/nfs-increase-size-of-exchange_id-name-string-buffer.patch
queue-4.1/pnfs-flexfiles-fix-the-reset-of-struct-pgio_header-when-resending.patch
queue-4.1/pnfs-fix-a-memory-leak-when-attempted-pnfs-fails.patch
queue-4.1/fixing-infinite-open-loop-in-4.0-stateid-recovery.patch
queue-4.1/nfs-ensure-we-set-nfs_context_resend_writes-when-requeuing-writes.patch
queue-4.1/sunrpc-fix-a-memory-leak-in-the-backchannel-code.patch
queue-4.1/nfs-fix-size-of-nfsacl-setacl-operations.patch
queue-4.1/nfs-always-update-creds-in-mirror-even-when-we-have-an-already-connected-ds.patch
queue-4.1/nfs-fix-potential-credential-leak-in-ff_layout_update_mirror_cred.patch