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

Patch "pNFS/flexfiles: 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/flexfiles: 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-flexfiles-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 c001c87a63aa2f35358e33eb05e45e4cbcb34f54 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 26 Jun 2016 12:39:49 -0400
Subject: pNFS/flexfiles: Fix layoutcommit after a commit to DS

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

commit c001c87a63aa2f35358e33eb05e45e4cbcb34f54 upstream.

We should always do a layoutcommit after commit to DS, except if
the layout segment we're using has set FF_FLAGS_NO_LAYOUTCOMMIT.

Fixes: d67ae825a59d ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -1529,8 +1529,7 @@ static int ff_layout_commit_done_cb(stru
 		return -EAGAIN;
 	}
 
-	if (data->verf.committed == NFS_UNSTABLE
-	    && ff_layout_need_layoutcommit(data->lseg))
+	if (ff_layout_need_layoutcommit(data->lseg))
 		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