Commit 1f18b82c authored by Trond Myklebust's avatar Trond Myklebust

pNFS: Ensure we commit the layout if it has been invalidated

If the layout is being invalidated on the server, then we must
invoke nfs_commit_inode() to ensure any commits to the DS get
cleared out.
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 722f0b89
...@@ -379,6 +379,7 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata) ...@@ -379,6 +379,7 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata)
pnfs_mark_layout_stateid_invalid(lo, &head); pnfs_mark_layout_stateid_invalid(lo, &head);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
pnfs_free_lseg_list(&head); pnfs_free_lseg_list(&head);
nfs_commit_inode(inode, 0);
} else } else
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
break; break;
......
...@@ -8330,6 +8330,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, ...@@ -8330,6 +8330,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task,
*/ */
pnfs_mark_layout_stateid_invalid(lo, &head); pnfs_mark_layout_stateid_invalid(lo, &head);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
nfs_commit_inode(inode, 0);
pnfs_free_lseg_list(&head); pnfs_free_lseg_list(&head);
status = -EAGAIN; status = -EAGAIN;
goto out; goto out;
......
...@@ -727,6 +727,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi) ...@@ -727,6 +727,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi)
pnfs_layout_clear_fail_bit(lo, NFS_LAYOUT_RW_FAILED); pnfs_layout_clear_fail_bit(lo, NFS_LAYOUT_RW_FAILED);
spin_unlock(&nfsi->vfs_inode.i_lock); spin_unlock(&nfsi->vfs_inode.i_lock);
pnfs_free_lseg_list(&tmp_list); pnfs_free_lseg_list(&tmp_list);
nfs_commit_inode(&nfsi->vfs_inode, 0);
pnfs_put_layout_hdr(lo); pnfs_put_layout_hdr(lo);
} else } else
spin_unlock(&nfsi->vfs_inode.i_lock); spin_unlock(&nfsi->vfs_inode.i_lock);
...@@ -1989,6 +1990,8 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) ...@@ -1989,6 +1990,8 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
spin_unlock(&ino->i_lock); spin_unlock(&ino->i_lock);
lseg->pls_layout = lo; lseg->pls_layout = lo;
NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg); NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);
if (!pnfs_layout_is_valid(lo))
nfs_commit_inode(ino, 0);
return ERR_PTR(-EAGAIN); return ERR_PTR(-EAGAIN);
} }
......
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