ceph: use generic_delete_inode() for ->drop_inode
PATCH 1/1 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]>
--- fs/ceph/inode.c | 10 ---------- fs/ceph/super.c | 2 +- fs/ceph/super.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-)
fs/ceph/inode.c +0 -10
@@ -578,16 +578,6 @@ void ceph_destroy_inode(struct inode *inode)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) {return (size + (1 <<9 ) -1 ) >>9 ;
fs/ceph/super.c +1 -1
@@ -843,7 +843,7 @@ static const struct super_operations ceph_super_ops = { .destroy_inode = ceph_destroy_inode, .free_inode = ceph_free_inode, .write_inode = ceph_write_inode, - .drop_inode = ceph_drop_inode, + .drop_inode = generic_delete_inode, .sync_fs = ceph_sync_fs, .put_super = ceph_put_super, .remount_fs = ceph_remount,
fs/ceph/super.h +0 -1
@@ -878,7 +878,6 @@ 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,struct ceph_vino vino);
Quoted 49 lines · Luis Henriques
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]>--- fs/ceph/inode.c | 10 ---------- fs/ceph/super.c | 2 +- fs/ceph/super.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-)fs/ceph/inode.c +0
-10@@ -578,16 +578,6 @@ void ceph_destroy_inode(struct inode *inode)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) {return (size + (1 <<9 ) -1 ) >>9 ;fs/ceph/super.c +1
-1@@ -843,7 +843,7 @@ static const struct super_operations ceph_super_ops = { .destroy_inode = ceph_destroy_inode, .free_inode = ceph_free_inode, .write_inode = ceph_write_inode, - .drop_inode = ceph_drop_inode, + .drop_inode = generic_delete_inode, .sync_fs = ceph_sync_fs, .put_super = ceph_put_super, .remount_fs = ceph_remount,fs/ceph/super.h +0
-0
fs/ceph/super.h extern const struct inode_operations ceph_file_iops; · line 883
Quoted 7 lines
fs/ceph/super.h +0
-1@@ -878,7 +878,6 @@ 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,struct ceph_vino vino);
Merged into ceph-client/testing. We should be able to get this in for 5.3.
Thanks!
Signature · 1 line
Jeff Layton <[email protected]>