Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b57922d9 authored by Al Viro's avatar Al Viro
Browse files

convert remaining ->clear_inode() to ->evict_inode() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 45321ac5

fs/9p/v9fs_vfs.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void v9fs_destroy_inode(struct inode *inode); 
#endif



struct inode *v9fs_get_inode(struct super_block *sb, int mode);

void v9fs_clear_inode(struct inode *inode);

void v9fs_evict_inode(struct inode *inode);

ino_t v9fs_qid2ino(struct p9_qid *qid);

void v9fs_stat2inode(struct p9_wstat *, struct inode *, struct super_block *);

int v9fs_dir_release(struct inode *inode, struct file *filp);

fs/9p/vfs_inode.c

+3 −1
Original line number Diff line number Diff line
@@ -387,8 +387,10 @@ error: 
 * @inode: inode to release

 *

 */

void v9fs_clear_inode(struct inode *inode)

void v9fs_evict_inode(struct inode *inode)

{

	truncate_inode_pages(inode->i_mapping, 0);

	end_writeback(inode);

	filemap_fdatawrite(inode->i_mapping);



#ifdef CONFIG_9P_FSCACHE

fs/9p/vfs_super.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static const struct super_operations v9fs_super_ops = { 
	.destroy_inode = v9fs_destroy_inode,

#endif

	.statfs = simple_statfs,

	.clear_inode = v9fs_clear_inode,

	.evict_inode = v9fs_evict_inode,

	.show_options = generic_show_options,

	.umount_begin = v9fs_umount_begin,

};
@@ -268,7 +268,7 @@ static const struct super_operations v9fs_super_ops_dotl = { 
	.destroy_inode = v9fs_destroy_inode,

#endif

	.statfs = v9fs_statfs,

	.clear_inode = v9fs_clear_inode,

	.evict_inode = v9fs_evict_inode,

	.show_options = generic_show_options,

	.umount_begin = v9fs_umount_begin,

};

fs/afs/inode.c

+4 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ int afs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
/*

 * clear an AFS inode

 */

void afs_clear_inode(struct inode *inode)

void afs_evict_inode(struct inode *inode)

{

	struct afs_permits *permits;

	struct afs_vnode *vnode;
@@ -335,6 +335,9 @@ void afs_clear_inode(struct inode *inode) 


	ASSERTCMP(inode->i_ino, ==, vnode->fid.vnode);



	truncate_inode_pages(&inode->i_data, 0);

	end_writeback(inode);



	afs_give_up_callback(vnode);



	if (vnode->server) {

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ extern void afs_zap_data(struct afs_vnode *); 
extern int afs_validate(struct afs_vnode *, struct key *);

extern int afs_getattr(struct vfsmount *, struct dentry *, struct kstat *);

extern int afs_setattr(struct dentry *, struct iattr *);

extern void afs_clear_inode(struct inode *);

extern void afs_evict_inode(struct inode *);



/*

 * main.c