summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-06-26 12:27:25 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-07 15:21:24 +0200
commit2bd1cf2e2f64fe257eec8ea06a71e8b94abd06c0 (patch)
tree6bcf109ad6a5fb92cd1bab09865741cd238c7ac4
parent2d46690499095bc4620d8d064385968fd3ce8c7d (diff)
downloadlinux-stable-2bd1cf2e2f64fe257eec8ea06a71e8b94abd06c0.tar.gz
linux-stable-2bd1cf2e2f64fe257eec8ea06a71e8b94abd06c0.tar.bz2
linux-stable-2bd1cf2e2f64fe257eec8ea06a71e8b94abd06c0.zip
pNFS/files: Fix layoutcommit after a commit to DS
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>
-rw-r--r--fs/nfs/filelayout/filelayout.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
index aa59757389dc..b4c1407e8fe4 100644
--- a/fs/nfs/filelayout/filelayout.c
+++ b/fs/nfs/filelayout/filelayout.c
@@ -375,8 +375,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;
}