Patch "pNFS/files: Fix layoutcommit after a commit to DS" has been added to the 4.7-stable tree

Patch "pNFS/files: Fix layoutcommit after a commit to DS" has been added to the 4.7-stable tree

[gregkh]

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

    pNFS/files: Fix layoutcommit after a commit to DS

to the 4.7-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-files-fix-layoutcommit-after-a-commit-to-ds.patch
and it can be found in the queue-4.7 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 73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 26 Jun 2016 12:27:25 -0400
Subject: pNFS/files: Fix layoutcommit after a commit to DS

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

commit 73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f upstream.

According to the errata
https://www.rfc-editor.org/errata_search.php?rfc=5661&eid=2751
we should always send layout commit after a commit to DS.

Fixes: bc7d4b8fd091 ("nfs/filelayout: set layoutcommit...")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 fs/nfs/filelayout/filelayout.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -375,8 +375,7 @@ static int filelayout_commit_done_cb(str
 		return -EAGAIN;
 	}
 
-	if (data->verf.committed == NFS_UNSTABLE)
-		pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
+	pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
 
 	return 0;
 }


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

queue-4.7/nfs-pnfs-do-not-clobber-existing-pgio_done_cb-in-nfs4_proc_read_setup.patch
queue-4.7/pnfs-flexfiles-fix-layoutcommit-after-a-commit-to-ds.patch
queue-4.7/pnfs-files-fix-layoutcommit-after-a-commit-to-ds.patch