mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
convert remaining ->clear_inode() to ->evict_inode()
Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
parent
45321ac543
commit
b57922d97f
34 changed files with 94 additions and 59 deletions
|
|
@ -98,7 +98,7 @@ u64 nfs_compat_user_ino64(u64 fileid)
|
|||
return ino;
|
||||
}
|
||||
|
||||
void nfs_clear_inode(struct inode *inode)
|
||||
static void nfs_clear_inode(struct inode *inode)
|
||||
{
|
||||
/*
|
||||
* The following should never happen...
|
||||
|
|
@ -110,6 +110,13 @@ void nfs_clear_inode(struct inode *inode)
|
|||
nfs_fscache_release_inode_cookie(inode);
|
||||
}
|
||||
|
||||
void nfs_evict_inode(struct inode *inode)
|
||||
{
|
||||
truncate_inode_pages(&inode->i_data, 0);
|
||||
end_writeback(inode);
|
||||
nfs_clear_inode(inode);
|
||||
}
|
||||
|
||||
/**
|
||||
* nfs_sync_mapping - helper to flush all mmapped dirty data to disk
|
||||
*/
|
||||
|
|
@ -1338,8 +1345,10 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
|
|||
* to open() calls that passed nfs_atomic_lookup, but failed to call
|
||||
* nfs_open().
|
||||
*/
|
||||
void nfs4_clear_inode(struct inode *inode)
|
||||
void nfs4_evict_inode(struct inode *inode)
|
||||
{
|
||||
truncate_inode_pages(&inode->i_data, 0);
|
||||
end_writeback(inode);
|
||||
/* If we are holding a delegation, return it! */
|
||||
nfs_inode_return_delegation_noreclaim(inode);
|
||||
/* First call standard NFS clear_inode() code */
|
||||
|
|
|
|||
|
|
@ -213,9 +213,9 @@ extern struct workqueue_struct *nfsiod_workqueue;
|
|||
extern struct inode *nfs_alloc_inode(struct super_block *sb);
|
||||
extern void nfs_destroy_inode(struct inode *);
|
||||
extern int nfs_write_inode(struct inode *, struct writeback_control *);
|
||||
extern void nfs_clear_inode(struct inode *);
|
||||
extern void nfs_evict_inode(struct inode *);
|
||||
#ifdef CONFIG_NFS_V4
|
||||
extern void nfs4_clear_inode(struct inode *);
|
||||
extern void nfs4_evict_inode(struct inode *);
|
||||
#endif
|
||||
void nfs_zap_acl_cache(struct inode *inode);
|
||||
extern int nfs_wait_bit_killable(void *word);
|
||||
|
|
|
|||
|
|
@ -270,7 +270,7 @@ static const struct super_operations nfs_sops = {
|
|||
.write_inode = nfs_write_inode,
|
||||
.put_super = nfs_put_super,
|
||||
.statfs = nfs_statfs,
|
||||
.clear_inode = nfs_clear_inode,
|
||||
.evict_inode = nfs_evict_inode,
|
||||
.umount_begin = nfs_umount_begin,
|
||||
.show_options = nfs_show_options,
|
||||
.show_stats = nfs_show_stats,
|
||||
|
|
@ -340,7 +340,7 @@ static const struct super_operations nfs4_sops = {
|
|||
.write_inode = nfs_write_inode,
|
||||
.put_super = nfs_put_super,
|
||||
.statfs = nfs_statfs,
|
||||
.clear_inode = nfs4_clear_inode,
|
||||
.evict_inode = nfs4_evict_inode,
|
||||
.umount_begin = nfs_umount_begin,
|
||||
.show_options = nfs_show_options,
|
||||
.show_stats = nfs_show_stats,
|
||||
|
|
|
|||
Loading…
Reference in a new issue