diff options
| author | Yan, Zheng <zheng.z.yan@intel.com> | 2013-09-02 11:19:53 +0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-06 23:55:09 +0400 |
| commit | ed284c49f61165c3ba1b4e6969d1cc30a769c31b (patch) | |
| tree | bfa19bc2645332a953b8c73bcc9f1abff6e3f9d1 /fs/ceph | |
| parent | 971f0bdeaabac4fcc335dace2f98e79157db4302 (diff) | |
| download | linux-ed284c49f61165c3ba1b4e6969d1cc30a769c31b.tar.xz | |
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>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/inode.c | 8 | ||||
| -rw-r--r-- | fs/ceph/mds_client.c | 2 | ||||
| -rw-r--r-- | fs/ceph/super.h | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index eae41cd73276..8549a48115f7 100644 --- 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 603786b564be..b7bda5d9611d 100644 --- 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 bb23ef636177..6014b0a3c405 100644 --- 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); |