Skip to content

Commit 52dd0f1

Browse files
Luis Henriquesidryomov
authored andcommitted
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 <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 87bc5b8 commit 52dd0f1

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

fs/ceph/inode.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -584,16 +584,6 @@ void ceph_evict_inode(struct inode *inode)
584584
ceph_put_string(rcu_dereference_raw(ci->i_layout.pool_ns));
585585
}
586586

587-
int ceph_drop_inode(struct inode *inode)
588-
{
589-
/*
590-
* Positve dentry and corresponding inode are always accompanied
591-
* in MDS reply. So no need to keep inode in the cache after
592-
* dropping all its aliases.
593-
*/
594-
return 1;
595-
}
596-
597587
static inline blkcnt_t calc_inode_blocks(u64 size)
598588
{
599589
return (size + (1<<9) - 1) >> 9;

fs/ceph/super.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ static const struct super_operations ceph_super_ops = {
842842
.alloc_inode = ceph_alloc_inode,
843843
.free_inode = ceph_free_inode,
844844
.write_inode = ceph_write_inode,
845-
.drop_inode = ceph_drop_inode,
845+
.drop_inode = generic_delete_inode,
846846
.evict_inode = ceph_evict_inode,
847847
.sync_fs = ceph_sync_fs,
848848
.put_super = ceph_put_super,

fs/ceph/super.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,6 @@ extern const struct inode_operations ceph_file_iops;
886886
extern struct inode *ceph_alloc_inode(struct super_block *sb);
887887
extern void ceph_evict_inode(struct inode *inode);
888888
extern void ceph_free_inode(struct inode *inode);
889-
extern int ceph_drop_inode(struct inode *inode);
890889

891890
extern struct inode *ceph_get_inode(struct super_block *sb,
892891
struct ceph_vino vino);

0 commit comments

Comments
 (0)