openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Rename nfs_inode_return_delegation_noreclaim() 

Rename nfs_inode_return_delegation_noreclaim() to
nfs_inode_evict_delegation(), which better describes what it
does.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-10-21 14:04:00 -04:00
parent b57562087b
commit b47e0e478c
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfs/delegation.c
View File

@ -585,19 +585,22 @@ int nfs_client_return_marked_delegations(struct nfs_client *clp)
} }
/** /**
* nfs_inode_return_delegation_noreclaim - return delegation, don't reclaim opens * nfs_inode_evict_delegation - return delegation, don't reclaim opens
* @inode: inode to process * @inode: inode to process
* *
* Does not protect against delegation reclaims, therefore really only safe * Does not protect against delegation reclaims, therefore really only safe
* to be called from nfs4_clear_inode(). * to be called from nfs4_clear_inode(). Guaranteed to always free
* the delegation structure.
*/ */
void nfs_inode_return_delegation_noreclaim(struct inode *inode) void nfs_inode_evict_delegation(struct inode *inode)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
delegation = nfs_inode_detach_delegation(inode); delegation = nfs_inode_detach_delegation(inode);
if (delegation != NULL) if (delegation != NULL) {
set_bit(NFS_DELEGATION_INODE_FREEING, &delegation->flags);
nfs_do_return_delegation(inode, delegation, 1); nfs_do_return_delegation(inode, delegation, 1);
}
} }
/** /**

2
fs/nfs/delegation.h
View File

@ -43,7 +43,7 @@ void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,
fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit); fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);
int nfs4_inode_return_delegation(struct inode *inode); int nfs4_inode_return_delegation(struct inode *inode);
int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid); int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);
void nfs_inode_return_delegation_noreclaim(struct inode *inode); void nfs_inode_evict_delegation(struct inode *inode);
struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle); struct inode *nfs_delegation_find_inode(struct nfs_client *clp, const struct nfs_fh *fhandle);
void nfs_server_return_all_delegations(struct nfs_server *); void nfs_server_return_all_delegations(struct nfs_server *);

4
fs/nfs/nfs4super.c
View File

@ -92,8 +92,8 @@ static void nfs4_evict_inode(struct inode *inode)
{ {
truncate_inode_pages_final(&inode->i_data); truncate_inode_pages_final(&inode->i_data);
clear_inode(inode); clear_inode(inode);
/* If we are holding a delegation, return it! */ /* If we are holding a delegation, return and free it */
nfs_inode_return_delegation_noreclaim(inode); nfs_inode_evict_delegation(inode);
/* Note that above delegreturn would trigger pnfs return-on-close */ /* Note that above delegreturn would trigger pnfs return-on-close */
pnfs_return_layout(inode); pnfs_return_layout(inode);
pnfs_destroy_layout(NFS_I(inode)); pnfs_destroy_layout(NFS_I(inode));