Commit aed06d36 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Ilya Dryomov
Browse files

ceph: Remove osd_client deadcode 



osd_req_op_extent_osd_data_pagelist() was added in 2013 as part of
commit a4ce40a9 ("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 ecd4a68a ("rbd: switch rbd_obj_method_sync() to
ceph_osdc_call()")

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Reviewed-by: default avatarViacheslav Dubeyko <Slava.Dubeyko@ibm.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 38fec10e

include/linux/ceph/osd_client.h

+0 −6
Original line number Diff line number Diff line
@@ -490,9 +490,6 @@ extern void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *, 
					struct page **pages, u64 length,

					u32 alignment, bool pages_from_pool,

					bool own_pages);

extern void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *,

					unsigned int which,

					struct ceph_pagelist *pagelist);

#ifdef CONFIG_BLOCK

void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,

				    unsigned int which,
@@ -509,9 +506,6 @@ void osd_req_op_extent_osd_data_bvec_pos(struct ceph_osd_request *osd_req, 
void osd_req_op_extent_osd_iter(struct ceph_osd_request *osd_req,

				unsigned int which, struct iov_iter *iter);



extern void osd_req_op_cls_request_data_pagelist(struct ceph_osd_request *,

					unsigned int which,

					struct ceph_pagelist *pagelist);

extern void osd_req_op_cls_request_data_pages(struct ceph_osd_request *,

					unsigned int which,

					struct page **pages, u64 length,

net/ceph/osd_client.c

+0 −23
Original line number Diff line number Diff line
@@ -220,16 +220,6 @@ void osd_req_op_extent_osd_data_pages(struct ceph_osd_request *osd_req, 
}

EXPORT_SYMBOL(osd_req_op_extent_osd_data_pages);



void osd_req_op_extent_osd_data_pagelist(struct ceph_osd_request *osd_req,

			unsigned int which, struct ceph_pagelist *pagelist)

{

	struct ceph_osd_data *osd_data;



	osd_data = osd_req_op_data(osd_req, which, extent, osd_data);

	ceph_osd_data_pagelist_init(osd_data, pagelist);

}

EXPORT_SYMBOL(osd_req_op_extent_osd_data_pagelist);



#ifdef CONFIG_BLOCK

void osd_req_op_extent_osd_data_bio(struct ceph_osd_request *osd_req,

				    unsigned int which,
@@ -297,19 +287,6 @@ static void osd_req_op_cls_request_info_pagelist( 
	ceph_osd_data_pagelist_init(osd_data, pagelist);

}



void osd_req_op_cls_request_data_pagelist(

			struct ceph_osd_request *osd_req,

			unsigned int which, struct ceph_pagelist *pagelist)

{

	struct ceph_osd_data *osd_data;



	osd_data = osd_req_op_data(osd_req, which, cls, request_data);

	ceph_osd_data_pagelist_init(osd_data, pagelist);

	osd_req->r_ops[which].cls.indata_len += pagelist->length;

	osd_req->r_ops[which].indata_len += pagelist->length;

}

EXPORT_SYMBOL(osd_req_op_cls_request_data_pagelist);



void osd_req_op_cls_request_data_pages(struct ceph_osd_request *osd_req,

			unsigned int which, struct page **pages, u64 length,

			u32 alignment, bool pages_from_pool, bool own_pages)