diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-06-26 12:39:49 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-05 18:52:26 -0400 |
| commit | c001c87a63aa2f35358e33eb05e45e4cbcb34f54 (patch) | |
| tree | 5277af9662782c2426e46e325945b2a4e9a0c439 /fs/nfs/flexfilelayout | |
| parent | 73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f (diff) | |
| download | linux-c001c87a63aa2f35358e33eb05e45e4cbcb34f54.tar.gz linux-c001c87a63aa2f35358e33eb05e45e4cbcb34f54.tar.bz2 linux-c001c87a63aa2f35358e33eb05e45e4cbcb34f54.zip | |
pNFS/flexfiles: Fix layoutcommit after a commit to DS
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>
Diffstat (limited to 'fs/nfs/flexfilelayout')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 0e8018bc9880..2689c9e9dc3c 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1530,8 +1530,7 @@ static int ff_layout_commit_done_cb(struct rpc_task *task, 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; |