Skip to content

Commit 6025b48

Browse files
Dr. David Alan Gilbertidryomov
authored andcommitted
ceph: Remove fs/ceph deadcode
ceph_caps_revoking() has been unused since 2017's commit 3fb99d4 ("ceph: nuke startsync op") ceph_mdsc_open_export_target_sessions() has been unused since 2013's commit 11df2df ("ceph: add imported caps when handling cap export message") Remove them. Signed-off-by: Dr. David Alan Gilbert <[email protected]> Reviewed-by: Ilya Dryomov <[email protected]> Signed-off-by: Ilya Dryomov <[email protected]>
1 parent 3e0f59f commit 6025b48

File tree

4 files changed

+0
-25
lines changed

4 files changed

+0
-25
lines changed

fs/ceph/caps.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -978,20 +978,6 @@ int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
978978
return 0;
979979
}
980980

981-
int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)
982-
{
983-
struct inode *inode = &ci->netfs.inode;
984-
struct ceph_client *cl = ceph_inode_to_client(inode);
985-
int ret;
986-
987-
spin_lock(&ci->i_ceph_lock);
988-
ret = __ceph_caps_revoking_other(ci, NULL, mask);
989-
spin_unlock(&ci->i_ceph_lock);
990-
doutc(cl, "%p %llx.%llx %s = %d\n", inode, ceph_vinop(inode),
991-
ceph_cap_string(mask), ret);
992-
return ret;
993-
}
994-
995981
int __ceph_caps_used(struct ceph_inode_info *ci)
996982
{
997983
int used = 0;

fs/ceph/mds_client.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,14 +1747,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,
17471747
}
17481748
}
17491749

1750-
void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
1751-
struct ceph_mds_session *session)
1752-
{
1753-
mutex_lock(&mdsc->mutex);
1754-
__open_export_target_sessions(mdsc, session);
1755-
mutex_unlock(&mdsc->mutex);
1756-
}
1757-
17581750
/*
17591751
* session caps
17601752
*/

fs/ceph/mds_client.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,8 +634,6 @@ extern void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc,
634634

635635
extern struct ceph_mds_session *
636636
ceph_mdsc_open_export_target_session(struct ceph_mds_client *mdsc, int target);
637-
extern void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
638-
struct ceph_mds_session *session);
639637

640638
extern int ceph_trim_caps(struct ceph_mds_client *mdsc,
641639
struct ceph_mds_session *session,

fs/ceph/super.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,6 @@ extern int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask,
796796

797797
extern int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
798798
struct ceph_cap *ocap, int mask);
799-
extern int ceph_caps_revoking(struct ceph_inode_info *ci, int mask);
800799
extern int __ceph_caps_used(struct ceph_inode_info *ci);
801800

802801
static inline bool __ceph_is_file_opened(struct ceph_inode_info *ci)

0 commit comments

Comments
 (0)