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

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

fs/nfs/nfs42proc.c

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata) 
			pnfs_mark_layout_stateid_invalid(lo, &head);

			spin_unlock(&inode->i_lock);

			pnfs_free_lseg_list(&head);

			nfs_commit_inode(inode, 0);

		} else

			spin_unlock(&inode->i_lock);

		break;

fs/nfs/nfs4proc.c

+1 −0
Original line number Diff line number Diff line
@@ -8330,6 +8330,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, 
		 */

		pnfs_mark_layout_stateid_invalid(lo, &head);

		spin_unlock(&inode->i_lock);

		nfs_commit_inode(inode, 0);

		pnfs_free_lseg_list(&head);

		status = -EAGAIN;

		goto out;

fs/nfs/pnfs.c

+3 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi) 
		pnfs_layout_clear_fail_bit(lo, NFS_LAYOUT_RW_FAILED);

		spin_unlock(&nfsi->vfs_inode.i_lock);

		pnfs_free_lseg_list(&tmp_list);

		nfs_commit_inode(&nfsi->vfs_inode, 0);

		pnfs_put_layout_hdr(lo);

	} else

		spin_unlock(&nfsi->vfs_inode.i_lock);
@@ -1989,6 +1990,8 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) 
	spin_unlock(&ino->i_lock);

	lseg->pls_layout = lo;

	NFS_SERVER(ino)->pnfs_curr_ld->free_lseg(lseg);

	if (!pnfs_layout_is_valid(lo))

		nfs_commit_inode(ino, 0);

	return ERR_PTR(-EAGAIN);

}