ceph: Remove fs/ceph deadcode

ceph_caps_revoking() has been unused since 2017's commit
3fb99d483e61 ("ceph: nuke startsync op")

ceph_mdsc_open_export_target_sessions() has been unused since 2013's
commit 11df2dfb610d ("ceph: add imported caps when handling cap export message")

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index bed34fc11c9195d926d400524b5d1ba055a5d602..0d6b2c0269bf16a511f95bb4d3faeeff45162588 100644 (file)
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -978,20 +978,6 @@ int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
        return 0;
 }
 
-int ceph_caps_revoking(struct ceph_inode_info *ci, int mask)
-{
-       struct inode *inode = &ci->netfs.inode;
-       struct ceph_client *cl = ceph_inode_to_client(inode);
-       int ret;
-
-       spin_lock(&ci->i_ceph_lock);
-       ret = __ceph_caps_revoking_other(ci, NULL, mask);
-       spin_unlock(&ci->i_ceph_lock);
-       doutc(cl, "%p %llx.%llx %s = %d\n", inode, ceph_vinop(inode),
-             ceph_cap_string(mask), ret);
-       return ret;
-}
-
 int __ceph_caps_used(struct ceph_inode_info *ci)
 {
        int used = 0;

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index c4a5fd94bbbb3ba440891a5f0a860260c6e4d0d5..923635532f03309c46ab60f00a41666c6d9f3fef 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1747,14 +1747,6 @@ static void __open_export_target_sessions(struct ceph_mds_client *mdsc,
        }
 }
 
-void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
-                                          struct ceph_mds_session *session)
-{
-       mutex_lock(&mdsc->mutex);
-       __open_export_target_sessions(mdsc, session);
-       mutex_unlock(&mdsc->mutex);
-}
-
 /*
  * session caps
  */

diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 3dd54587944ac05f39e2e8d79592202707c26463..38bb7e0d2d7916b6371574f082de2ab1cd79806b 100644 (file)
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -634,8 +634,6 @@ extern void ceph_mdsc_handle_fsmap(struct ceph_mds_client *mdsc,
 
 extern struct ceph_mds_session *
 ceph_mdsc_open_export_target_session(struct ceph_mds_client *mdsc, int target);
-extern void ceph_mdsc_open_export_target_sessions(struct ceph_mds_client *mdsc,
-                                         struct ceph_mds_session *session);
 
 extern int ceph_trim_caps(struct ceph_mds_client *mdsc,
                          struct ceph_mds_session *session,

diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 037eac35a9e02ae27f0261e1cba97fb4e596c2f3..b0b15e87251d5e6af10ff353a4a20d4b9b157b52 100644 (file)
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -796,7 +796,6 @@ extern int __ceph_mark_dirty_caps(struct ceph_inode_info *ci, int mask,
 
 extern int __ceph_caps_revoking_other(struct ceph_inode_info *ci,
                                      struct ceph_cap *ocap, int mask);
-extern int ceph_caps_revoking(struct ceph_inode_info *ci, int mask);
 extern int __ceph_caps_used(struct ceph_inode_info *ci);
 
 static inline bool __ceph_is_file_opened(struct ceph_inode_info *ci)