libceph: nuke unused fields and functions

Either unused or useless:

    osdmap->mkfs_epoch
    osd->o_marked_for_keepalive
    monc->num_generic_requests
    osdc->map_waiters
    osdc->last_requested_map
    osdc->timeout_tid

    osd_req_op_cls_response_data()

    osdmap_apply_incremental() @msgr arg

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

3 files changed, 2 insertions, 13 deletions

diff --git a/include/linux/ceph/mon_client.h b/include/linux/ceph/mon_client.h
index e230e7ed60d3..330d045e4092 100644
--- a/include/linux/ceph/mon_client.h
+++ b/include/linux/ceph/mon_client.h
@@ -77,7 +77,6 @@ struct ceph_mon_client {
 
         /* pending generic requests */
         struct rb_root generic_request_tree;
-        int num_generic_requests;
         u64 last_tid;
 
         /* subs, indexed with CEPH_SUB_* */
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 66a1fcd5bff7..63854a8df183 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -37,11 +37,9 @@ struct ceph_osd {
         struct list_head o_osd_lru;
         struct ceph_auth_handshake o_auth;
         unsigned long lru_ttl;
-        int o_marked_for_keepalive;
         struct list_head o_keepalive_item;
 };
 
-
 #define CEPH_OSD_SLAB_OPS       2
 #define CEPH_OSD_MAX_OPS        16
 
@@ -206,13 +204,10 @@ struct ceph_osd_client {
 
         struct ceph_osdmap     *osdmap;       /* current map */
         struct rw_semaphore    map_sem;
-        struct completion      map_waiters;
-        u64                    last_requested_map;
 
         struct mutex           request_mutex;
         struct rb_root         osds;          /* osds */
         struct list_head       osd_lru;       /* idle osds */
-        u64                    timeout_tid;   /* tid of timeout triggering rq */
         u64                    last_tid;      /* tid of last request */
         struct rb_root         requests;      /* pending requests */
         struct list_head       req_lru;       /* in-flight lru */
@@ -271,9 +266,6 @@ extern void osd_req_op_extent_dup_last(struct ceph_osd_request *osd_req,
 extern struct ceph_osd_data *osd_req_op_extent_osd_data(
                                         struct ceph_osd_request *osd_req,
                                         unsigned int which);
-extern struct ceph_osd_data *osd_req_op_cls_response_data(
-                                        struct ceph_osd_request *osd_req,
-                                        unsigned int which);
 
 extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *,
                                         unsigned int which,
diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h
index 777a29412706..ce7a41a182d4 100644
--- a/include/linux/ceph/osdmap.h
+++ b/include/linux/ceph/osdmap.h
@@ -123,7 +123,6 @@ struct ceph_pg_mapping {
 struct ceph_osdmap {
         struct ceph_fsid fsid;
         u32 epoch;
-        u32 mkfs_epoch;
         struct ceph_timespec created, modified;
 
         u32 flags;         /* CEPH_OSDMAP_* */
@@ -205,9 +204,8 @@ static inline int ceph_decode_pgid(void **p, void *end, struct ceph_pg *pgid)
 }
 
 extern struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end);
-extern struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
-                                            struct ceph_osdmap *map,
-                                            struct ceph_messenger *msgr);
+struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end,
+                                             struct ceph_osdmap *map);
 extern void ceph_osdmap_destroy(struct ceph_osdmap *map);
 
 /* calculate mapping of a file extent to an object */