| From 73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Sun, 26 Jun 2016 12:27:25 -0400 |
| Subject: pNFS/files: Fix layoutcommit after a commit to DS |
| |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| |
| commit 73e6c5d854d3f7f75e8b46d3e54aeb5d83fe6b1f upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/filelayout/filelayout.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/fs/nfs/filelayout/filelayout.c |
| +++ b/fs/nfs/filelayout/filelayout.c |
| @@ -374,8 +374,7 @@ static int filelayout_commit_done_cb(str |
| 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; |
| } |