Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed284c49 authored by Yan, Zheng's avatar Yan, Zheng Committed by Sage Weil
Browse files

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: default avatarYan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: default avatarAlex Elder <alex.elder@linary.org>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent 971f0bde

fs/ceph/inode.c

+0 −8
Original line number Diff line number Diff line
@@ -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

 */

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/ceph/super.h

+0 −2
Original line number Diff line number Diff line
@@ -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);