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>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index a565ab1242826bc5b2eeae185cdd41c6b01ef7e3..791f84a13bb8e16daad628d07e0e8573024c4a3f 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -584,16 +584,6 @@ void ceph_evict_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;

diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 5f0c950ca9666ba258f0ecfac627917778d7dd6a..84d23c896daa51a984c1f332f3011cad002891e4 100644 (file)
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -842,7 +842,7 @@ static const struct super_operations ceph_super_ops = {
        .alloc_inode    = ceph_alloc_inode,
        .free_inode     = ceph_free_inode,
        .write_inode    = ceph_write_inode,
-       .drop_inode     = ceph_drop_inode,
+       .drop_inode     = generic_delete_inode,
        .evict_inode    = ceph_evict_inode,
        .sync_fs        = ceph_sync_fs,
        .put_super      = ceph_put_super,

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 30e9a4e415cc380eaa52c076b2e7524dfb033f73..4196f30e5bdc76955ee0fed6b61d620151a1181b 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -886,7 +886,6 @@ extern const struct inode_operations ceph_file_iops;
 extern struct inode *ceph_alloc_inode(struct super_block *sb);
 extern void ceph_evict_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);