lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceph: remove ceph_lookup_inode()

Browse Source 
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>
This commit is contained in:
Yan, Zheng
2013-09-02 15:19:53 +08:00
committed by Sage Weil
parent 971f0bdeaa
commit ed284c49f6
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/ceph/inode.c
View File

@@ -62,14 +62,6 @@ struct inode *ceph_get_inode(struct super_block *sb, struct ceph_vino vino)
return inode; 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 * get/constuct snapdir inode for a given directory
*/ */

2
fs/ceph/mds_client.c
View File

@@ -1054,7 +1054,7 @@ static void remove_session_caps(struct ceph_mds_session *session)
vino = cap->ci->i_vino; vino = cap->ci->i_vino;
spin_unlock(&session->s_cap_lock); spin_unlock(&session->s_cap_lock);
inode = ceph_lookup_inode(sb, vino); inode = ceph_find_inode(sb, vino);
iput(inode); iput(inode);
spin_lock(&session->s_cap_lock); spin_lock(&session->s_cap_lock);

2
fs/ceph/super.h
View File

@@ -694,8 +694,6 @@ extern void ceph_destroy_inode(struct inode *inode);
extern struct inode *ceph_get_inode(struct super_block *sb, extern struct inode *ceph_get_inode(struct super_block *sb,
struct ceph_vino vino); 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 struct inode *ceph_get_snapdir(struct inode *parent);
extern int ceph_fill_file_size(struct inode *inode, int issued, extern int ceph_fill_file_size(struct inode *inode, int issued,
u32 truncate_seq, u64 truncate_size, u64 size); u32 truncate_seq, u64 truncate_size, u64 size);