aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/inode.c8
-rw-r--r--fs/ceph/mds_client.c2
-rw-r--r--fs/ceph/super.h2
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)
62 return inode; 62 return inode;
63} 63}
64 64
65struct inode *ceph_lookup_inode(struct super_block *sb, struct ceph_vino vino)
66{
67 struct inode *inode;
68 ino_t t = ceph_vino_to_ino(vino);
69 inode = ilookup5_nowait(sb, t, ceph_ino_compare, &vino);
70 return inode;
71}
72
73/* 65/*
74 * get/constuct snapdir inode for a given directory 66 * get/constuct snapdir inode for a given directory
75 */ 67 */
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)
1054 vino = cap->ci->i_vino; 1054 vino = cap->ci->i_vino;
1055 spin_unlock(&session->s_cap_lock); 1055 spin_unlock(&session->s_cap_lock);
1056 1056
1057 inode = ceph_lookup_inode(sb, vino); 1057 inode = ceph_find_inode(sb, vino);
1058 iput(inode); 1058 iput(inode);
1059 1059
1060 spin_lock(&session->s_cap_lock); 1060 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);
694 694
695extern struct inode *ceph_get_inode(struct super_block *sb, 695extern struct inode *ceph_get_inode(struct super_block *sb,
696 struct ceph_vino vino); 696 struct ceph_vino vino);
697extern struct inode *ceph_lookup_inode(struct super_block *sb,
698 struct ceph_vino vino);
699extern struct inode *ceph_get_snapdir(struct inode *parent); 697extern struct inode *ceph_get_snapdir(struct inode *parent);
700extern int ceph_fill_file_size(struct inode *inode, int issued, 698extern int ceph_fill_file_size(struct inode *inode, int issued,
701 u32 truncate_seq, u64 truncate_size, u64 size); 699 u32 truncate_seq, u64 truncate_size, u64 size);