Commit 87bc5b89 authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

ceph: use ceph_evict_inode to cleanup inode's resource 

remove_session_caps() relies on __wait_on_freeing_inode(), to wait for
freeing inode to remove its caps. But VFS wakes freeing inode waiters
before calling destroy_inode().

Cc: stable@vger.kernel.org
Link: https://tracker.ceph.com/issues/40102


Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 0f7cf80a

fs/ceph/inode.c

+5 −2
Original line number Diff line number Diff line
@@ -526,13 +526,16 @@ void ceph_free_inode(struct inode *inode) 
	kmem_cache_free(ceph_inode_cachep, ci);

}



void ceph_destroy_inode(struct inode *inode)

void ceph_evict_inode(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	struct ceph_inode_frag *frag;

	struct rb_node *n;



	dout("destroy_inode %p ino %llx.%llx\n", inode, ceph_vinop(inode));

	dout("evict_inode %p ino %llx.%llx\n", inode, ceph_vinop(inode));



	truncate_inode_pages_final(&inode->i_data);

	clear_inode(inode);



	ceph_fscache_unregister_inode_cookie(ci);

fs/ceph/super.c

+1 −1
Original line number Diff line number Diff line
@@ -840,10 +840,10 @@ static int ceph_remount(struct super_block *sb, int *flags, char *data) 


static const struct super_operations ceph_super_ops = {

	.alloc_inode	= ceph_alloc_inode,

	.destroy_inode	= ceph_destroy_inode,

	.free_inode	= ceph_free_inode,

	.write_inode    = ceph_write_inode,

	.drop_inode	= ceph_drop_inode,

	.evict_inode	= ceph_evict_inode,

	.sync_fs        = ceph_sync_fs,

	.put_super	= ceph_put_super,

	.remount_fs	= ceph_remount,

fs/ceph/super.h

+1 −1
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ static inline bool __ceph_have_pending_cap_snap(struct ceph_inode_info *ci) 
extern const struct inode_operations ceph_file_iops;



extern struct inode *ceph_alloc_inode(struct super_block *sb);

extern void ceph_destroy_inode(struct inode *inode);

extern void ceph_evict_inode(struct inode *inode);

extern void ceph_free_inode(struct inode *inode);

extern int ceph_drop_inode(struct inode *inode);

CRA Git | Maintained and supported by SUSTech CRA and CCSE