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

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

ceph: use ->free_inode() 



a lot of non-delayed work in this case; all of that is left in
->destroy_inode()

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

fs/ceph/inode.c

+1 −4
Original line number Diff line number Diff line
@@ -519,9 +519,8 @@ struct inode *ceph_alloc_inode(struct super_block *sb) 
	return &ci->vfs_inode;

}



static void ceph_i_callback(struct rcu_head *head)

void ceph_free_inode(struct inode *inode)

{

	struct inode *inode = container_of(head, struct inode, i_rcu);

	struct ceph_inode_info *ci = ceph_inode(inode);



	kfree(ci->i_symlink);
@@ -581,8 +580,6 @@ void ceph_destroy_inode(struct inode *inode) 
		ceph_buffer_put(ci->i_xattrs.prealloc_blob);



	ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));



	call_rcu(&inode->i_rcu, ceph_i_callback);

}



int ceph_drop_inode(struct inode *inode)

fs/ceph/super.c

+1 −0
Original line number Diff line number Diff line
@@ -848,6 +848,7 @@ static void ceph_umount_begin(struct super_block *sb) 
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,

	.sync_fs        = ceph_sync_fs,

fs/ceph/super.h

+1 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ 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_free_inode(struct inode *inode);

extern int ceph_drop_inode(struct inode *inode);



extern struct inode *ceph_get_inode(struct super_block *sb,