diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-04-28 16:07:21 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-05-26 00:36:23 +0200 |
| commit | 0c0a8de13f9612a663b050afa955e6668858d1eb (patch) | |
| tree | 6849c721a09c3bb12af83decd4792af909dd5caa /net | |
| parent | c41d13a31fefed303f734c0c5106f6dcd262168e (diff) | |
| download | linux-0c0a8de13f9612a663b050afa955e6668858d1eb.tar.gz | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/mon_client.c | 3 | ||||
| -rw-r--r-- | net/ceph/osd_client.c | 13 | ||||
| -rw-r--r-- | net/ceph/osdmap.c | 3 |
3 files changed, 2 insertions, 17 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index cf638c009cfa..3dfafdad92aa 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -579,7 +579,6 @@ static int __do_generic_request(struct ceph_mon_client *monc, u64 tid, req->tid = tid != 0 ? tid : ++monc->last_tid; req->request->hdr.tid = cpu_to_le64(req->tid); __insert_generic_request(monc, req); - monc->num_generic_requests++; ceph_con_send(&monc->con, ceph_msg_get(req->request)); mutex_unlock(&monc->mutex); @@ -587,7 +586,6 @@ static int __do_generic_request(struct ceph_mon_client *monc, u64 tid, mutex_lock(&monc->mutex); rb_erase(&req->node, &monc->generic_request_tree); - monc->num_generic_requests--; if (!err) err = req->result; @@ -914,7 +912,6 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) INIT_DELAYED_WORK(&monc->delayed_work, delayed_work); monc->generic_request_tree = RB_ROOT; - monc->num_generic_requests = 0; monc->last_tid = 0; return 0; diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 95910aed8e2e..32ba09be6ee6 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -143,14 +143,6 @@ osd_req_op_extent_osd_data(struct ceph_osd_request *osd_req, } EXPORT_SYMBOL(osd_req_op_extent_osd_data); -struct ceph_osd_data * -osd_req_op_cls_response_data(struct ceph_osd_request *osd_req, - unsigned int which) -{ - return osd_req_op_data(osd_req, which, cls, response_data); -} -EXPORT_SYMBOL(osd_req_op_cls_response_data); /* ??? */ - void osd_req_op_raw_data_in_pages(struct ceph_osd_request *osd_req, unsigned int which, struct page **pages, u64 length, u32 alignment, @@ -2166,8 +2158,7 @@ void ceph_osdc_handle_map(struct ceph_osd_client *osdc, struct ceph_msg *msg) dout("applying incremental map %u len %d\n", epoch, maplen); newmap = osdmap_apply_incremental(&p, next, - osdc->osdmap, - &osdc->client->msgr); + osdc->osdmap); if (IS_ERR(newmap)) { err = PTR_ERR(newmap); goto bad; @@ -2674,8 +2665,6 @@ int ceph_osdc_init(struct ceph_osd_client *osdc, struct ceph_client *client) osdc->client = client; osdc->osdmap = NULL; init_rwsem(&osdc->map_sem); - init_completion(&osdc->map_waiters); - osdc->last_requested_map = 0; mutex_init(&osdc->request_mutex); osdc->last_tid = 0; osdc->osds = RB_ROOT; diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 4668b871ca47..9a0cc072a909 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -1204,8 +1204,7 @@ struct ceph_osdmap *ceph_osdmap_decode(void **p, void *end) * decode and apply an incremental map update. */ struct ceph_osdmap *osdmap_apply_incremental(void **p, void *end, - struct ceph_osdmap *map, - struct ceph_messenger *msgr) + struct ceph_osdmap *map) { struct crush_map *newcrush = NULL; struct ceph_fsid fsid; |