Skip to content

Commit aed06d3

Browse files
Dr. David Alan Gilbertidryomov
authored andcommitted
ceph: Remove osd_client deadcode
osd_req_op_extent_osd_data_pagelist() was added in 2013 as part of commit a4ce40a ("libceph: combine initializing and setting osd data") but never used. The last use of osd_req_op_cls_request_data_pagelist() was removed in 2017's commit ecd4a68 ("rbd: switch rbd_obj_method_sync() to ceph_osdc_call()") Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Reviewed-by: Viacheslav Dubeyko <Slava.Dubeyko@ibm.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent 38fec10 commit aed06d3

File tree

2 files changed

+0
-29
lines changed

2 files changed

+0
-29
lines changed

include/linux/ceph/osd_client.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,6 @@ extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *,
490490
struct page **pages, u64 length,
491491
u32 alignment, bool pages_from_pool,
492492
bool own_pages);
493-
extern void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *,
494-
unsigned int which,
495-
struct ceph_pagelist *pagelist);
496493
#ifdef CONFIG_BLOCK
497494
void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,
498495
unsigned int which,
@@ -509,9 +506,6 @@ void osd_req_op_extent_osd_data_bvec_pos(struct ceph_osd_request *osd_req,
509506
void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,
510507
unsigned int which, struct iov_iter *iter);
511508

512-
extern void osd_req_op_cls_request_data_pagelist(struct ceph_osd_request *,
513-
unsigned int which,
514-
struct ceph_pagelist *pagelist);
515509
extern void osd_req_op_cls_request_data_pages(struct ceph_osd_request *,
516510
unsigned int which,
517511
struct page **pages, u64 length,

net/ceph/osd_client.c

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,6 @@ void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *osd_req,
220220
}
221221
EXPORT_SYMBOL(osd_req_op_extent_osd_data_pages);
222222

223-
void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *osd_req,
224-
unsigned int which, struct ceph_pagelist *pagelist)
225-
{
226-
struct ceph_osd_data *osd_data;
227-
228-
osd_data = osd_req_op_data(osd_req, which, extent, osd_data);
229-
ceph_osd_data_pagelist_init(osd_data, pagelist);
230-
}
231-
EXPORT_SYMBOL(osd_req_op_extent_osd_data_pagelist);
232-
233223
#ifdef CONFIG_BLOCK
234224
void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,
235225
unsigned int which,
@@ -297,19 +287,6 @@ static void osd_req_op_cls_request_info_pagelist(
297287
ceph_osd_data_pagelist_init(osd_data, pagelist);
298288
}
299289

300-
void osd_req_op_cls_request_data_pagelist(
301-
struct ceph_osd_request *osd_req,
302-
unsigned int which, struct ceph_pagelist *pagelist)
303-
{
304-
struct ceph_osd_data *osd_data;
305-
306-
osd_data = osd_req_op_data(osd_req, which, cls, request_data);
307-
ceph_osd_data_pagelist_init(osd_data, pagelist);
308-
osd_req->r_ops[which].cls.indata_len += pagelist->length;
309-
osd_req->r_ops[which].indata_len += pagelist->length;
310-
}
311-
EXPORT_SYMBOL(osd_req_op_cls_request_data_pagelist);
312-
313290
void osd_req_op_cls_request_data_pages(struct ceph_osd_request *osd_req,
314291
unsigned int which, struct page **pages, u64 length,
315292
u32 alignment, bool pages_from_pool, bool own_pages)

0 commit comments

Comments
 (0)