diff options
| author |   Yan, Zheng <zyan@redhat.com> | 2019-06-02 09:45:38 +0800 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2019-07-08 14:01:45 +0200 |
| commit | 87bc5b895d94a0f40fe170d4cf5771c8e8f85d15 (patch) | |
| tree | af317e037b3f4e23b24d483f4f6db617cf3e905b /fs/ceph/inode.c | |
| parent | ceph: initialize superblock s_time_gran to 1 (diff) | |
| download | linux-dev-87bc5b895d94a0f40fe170d4cf5771c8e8f85d15.tar.xz linux-dev-87bc5b895d94a0f40fe170d4cf5771c8e8f85d15.zip | |
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: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph/inode.c')
| -rw-r--r-- | fs/ceph/inode.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 2c49eb831c6f..a565ab124282 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -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); |