Skip to content

Commit

Permalink
pNFS/flexfiles: Fix layoutcommit after a commit to DS
Browse files Browse the repository at this point in the history
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: d67ae82 ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
  • Loading branch information
Trond Myklebust committed Jul 5, 2016
1 parent 73e6c5d commit c001c87
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions fs/nfs/flexfilelayout/flexfilelayout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit c001c87

Please sign in to comment.