Commit 415320fc authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Return the delegation before returning the layout in evict_inode() 



Minor optimisation for the case where the layout has return-on-close
enabled.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 81b79afb

fs/nfs/nfs4super.c

+3 −2
Original line number Diff line number Diff line
@@ -91,10 +91,11 @@ static void nfs4_evict_inode(struct inode *inode) 
{

	truncate_inode_pages_final(&inode->i_data);

	clear_inode(inode);

	pnfs_return_layout(inode);

	pnfs_destroy_layout(NFS_I(inode));

	/* If we are holding a delegation, return it! */

	nfs_inode_return_delegation_noreclaim(inode);

	/* Note that above delegreturn would trigger pnfs return-on-close */

	pnfs_return_layout(inode);

	pnfs_destroy_layout(NFS_I(inode));

	/* First call standard NFS clear_inode() code */

	nfs_clear_inode(inode);

}