summaryrefslogtreecommitdiffstats
path: root/fs/nfs/filelayout
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2016-06-26 12:27:25 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2016-07-05 18:52:25 -0400
commit73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f (patch)
tree71f03e1966e9ada34274a9fda77a63eacbd16520 /fs/nfs/filelayout
parent4f52b6bb8c57b9accafad526a429d6c0851cc62f (diff)
downloadlinux-73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f.tar.bz2
pNFS/files: Fix layoutcommit after a commit to DS
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>
Diffstat (limited to 'fs/nfs/filelayout')
-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;
}