diff options
| author | Peng Tao <tao.peng@primarydata.com> | 2014-08-07 10:15:03 +0800 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-09-10 12:47:01 -0700 |
| commit | bc7d4b8fd0917b4b84a8911185d34a97c696f219 (patch) | |
| tree | 4f6478838ad3a80e691b6cc70efd0dc3c552e3c5 | |
| parent | 378520b837cf4da769600b83690d8e825f16a611 (diff) | |
| download | linux-stable-bc7d4b8fd0917b4b84a8911185d34a97c696f219.tar.gz linux-stable-bc7d4b8fd0917b4b84a8911185d34a97c696f219.tar.bz2 linux-stable-bc7d4b8fd0917b4b84a8911185d34a97c696f219.zip | |
nfs/filelayout: set layoutcommit depending on write verifier
Following http://www.rfc-editor.org/errata_search.php?rfc=5661&eid=2751
Don't set layoutcommit for commit_through_mds case.
For FILE_SYNC writes, don't set layoutcommit.
For DATA_SYNC wirtes, set layout commit right after wirtes done.
For UNSTABLE writes, set layout commit when commit done.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/filelayout/filelayout.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 90978075f730..163cad1d4127 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -265,7 +265,7 @@ filelayout_set_layoutcommit(struct nfs_pgio_header *hdr) { if (FILELAYOUT_LSEG(hdr->lseg)->commit_through_mds || - hdr->res.verf->committed == NFS_FILE_SYNC) + hdr->res.verf->committed != NFS_DATA_SYNC) return; pnfs_set_layoutcommit(hdr); @@ -403,6 +403,9 @@ static int filelayout_commit_done_cb(struct rpc_task *task, return -EAGAIN; } + if (data->verf.committed == NFS_UNSTABLE) + pnfs_commit_set_layoutcommit(data); + return 0; } |