Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Trond Myklebust <trond.myklebust@primarydata.com>
+3
-2
+3
-2
fs/nfs/nfs4super.c
+3
-2
fs/nfs/nfs4super.c
···
91
91
{
92
92
truncate_inode_pages_final(&inode->i_data);
93
93
clear_inode(inode);
94
-
pnfs_return_layout(inode);
95
-
pnfs_destroy_layout(NFS_I(inode));
96
94
/* If we are holding a delegation, return it! */
97
95
nfs_inode_return_delegation_noreclaim(inode);
96
+
/* Note that above delegreturn would trigger pnfs return-on-close */
97
+
pnfs_return_layout(inode);
98
+
pnfs_destroy_layout(NFS_I(inode));
98
99
/* First call standard NFS clear_inode() code */
99
100
nfs_clear_inode(inode);
100
101
}