ceph: remove ceph_lookup_inode()

commit 6f60f889 (ceph: fix freeing inode vs removing session caps race)
introduced ceph_lookup_inode(). But there is already a ceph_find_inode()
which provides similar function. So remove ceph_lookup_inode(), use
ceph_find_inode() instead.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Alex Elder <alex.elder@linary.org>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index eae41cd732760543f458831a27c3b3a0c1d50a32..8549a48115f71b23e1f35ef444caf3eb32dbced3 100644 (file)
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -62,14 +62,6 @@ struct inode *ceph_get_inode(struct super_block *sb, struct ceph_vino vino)
        return inode;
 }
 
-struct inode *ceph_lookup_inode(struct super_block *sb, struct ceph_vino vino)
-{
-       struct inode *inode;
-       ino_t t = ceph_vino_to_ino(vino);
-       inode = ilookup5_nowait(sb, t, ceph_ino_compare, &vino);
-       return inode;
-}
-
 /*
  * get/constuct snapdir inode for a given directory
  */

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 603786b564bed08e2591761ae79aa5ef0c926849..b7bda5d9611da031aaf6f104ece9fa6351993070 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1054,7 +1054,7 @@ static void remove_session_caps(struct ceph_mds_session *session)
                        vino = cap->ci->i_vino;
                        spin_unlock(&session->s_cap_lock);
 
-                       inode = ceph_lookup_inode(sb, vino);
+                       inode = ceph_find_inode(sb, vino);
                        iput(inode);
 
                        spin_lock(&session->s_cap_lock);

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index bb23ef6361778d8c8635b965098c065979ef318b..6014b0a3c405cb12dfb62fdac7887f83a4977b96 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -694,8 +694,6 @@ extern void ceph_destroy_inode(struct inode *inode);
 
 extern struct inode *ceph_get_inode(struct super_block *sb,
                                    struct ceph_vino vino);
-extern struct inode *ceph_lookup_inode(struct super_block *sb,
-                                      struct ceph_vino vino);
 extern struct inode *ceph_get_snapdir(struct inode *parent);
 extern int ceph_fill_file_size(struct inode *inode, int issued,
                               u32 truncate_seq, u64 truncate_size, u64 size);