Commit 52dd0f1b authored Jul 05, 2019 by Luis Henriques Committed by Ilya Dryomov Jul 08, 2019

ceph: use generic_delete_inode() for ->drop_inode



ceph_drop_inode() implementation is not any different from the generic
function, thus there's no point in keeping it around.

Signed-off-by: Luis Henriques <lhenriques@suse.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 87bc5b89

fs/ceph/inode.c

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -584,16 +584,6 @@ void ceph_evict_inode(struct inode *inode)
	ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));		ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));
	}		}

	int ceph_drop_inode(struct inode *inode)
	{
	/*
	* Positve dentry and corresponding inode are always accompanied
	* in MDS reply. So no need to keep inode in the cache after
	* dropping all its aliases.
	*/
	return 1;
	}

	static inline blkcnt_t calc_inode_blocks(u64 size)		static inline blkcnt_t calc_inode_blocks(u64 size)
	{		{
	return (size + (1<<9) - 1) >> 9;		return (size + (1<<9) - 1) >> 9;

fs/ceph/super.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -842,7 +842,7 @@ static const struct super_operations ceph_super_ops = {
	.alloc_inode = ceph_alloc_inode,		.alloc_inode = ceph_alloc_inode,
	.free_inode = ceph_free_inode,		.free_inode = ceph_free_inode,
	.write_inode = ceph_write_inode,		.write_inode = ceph_write_inode,
	.drop_inode = ceph_drop_inode,		.drop_inode = generic_delete_inode,
	.evict_inode = ceph_evict_inode,		.evict_inode = ceph_evict_inode,
	.sync_fs = ceph_sync_fs,		.sync_fs = ceph_sync_fs,
	.put_super = ceph_put_super,		.put_super = ceph_put_super,

fs/ceph/super.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -886,7 +886,6 @@ extern const struct inode_operations ceph_file_iops;
	extern struct inode ceph_alloc_inode(struct super_block sb);		extern struct inode ceph_alloc_inode(struct super_block sb);
	extern void ceph_evict_inode(struct inode *inode);		extern void ceph_evict_inode(struct inode *inode);
	extern void ceph_free_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,		extern struct inode ceph_get_inode(struct super_block sb,
	struct ceph_vino vino);		struct ceph_vino vino);