Commit ea7bc26f authored by Trond Myklebust's avatar Trond Myklebust Committed by Seth Forshee

pNFS/flexfiles: Fix layoutcommit after a commit to DS

BugLink: http://bugs.launchpad.net/bugs/1631468

commit c001c87a upstream.

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: d67ae825 ("pnfs/flexfiles: Add the FlexFile Layout Driver")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent a8c3f8fd
...@@ -1414,8 +1414,7 @@ static int ff_layout_commit_done_cb(struct rpc_task *task, ...@@ -1414,8 +1414,7 @@ static int ff_layout_commit_done_cb(struct rpc_task *task,
return -EAGAIN; return -EAGAIN;
} }
if (data->verf.committed == NFS_UNSTABLE if (ff_layout_need_layoutcommit(data->lseg))
&& ff_layout_need_layoutcommit(data->lseg))
pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb); pnfs_set_layoutcommit(data->inode, data->lseg, data->lwb);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment