From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 26 Jun 2016 16:27:25 +0000 (-0400)
Subject: pNFS/files: Fix layoutcommit after a commit to DS
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~1838
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a8c3f8fd374be80dbb5c59e28249877e184e87e2;p=mirror_ubuntu-artful-kernel.git

pNFS/files: Fix layoutcommit after a commit to DS

BugLink: http://bugs.launchpad.net/bugs/1631468

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>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---

diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index 02ec07973bc4..fd8da630fd22 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -374,8 +374,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task,
 		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;
 }