Commit 4cf3e6df authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

libceph: export osd_req_op_data() macro 



We already have one exported wrapper around it for extent.osd_data and
rbd_object_map_update_finish() needs another one for cls.request_data.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
Reviewed-by: default avatarDongsheng Yang <dongsheng.yang@easystack.cn>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
parent 68ada915

include/linux/ceph/osd_client.h

+8 −0
Original line number Diff line number Diff line
@@ -389,6 +389,14 @@ extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc, 
void ceph_osdc_update_epoch_barrier(struct ceph_osd_client *osdc, u32 eb);

void ceph_osdc_abort_requests(struct ceph_osd_client *osdc, int err);



#define osd_req_op_data(oreq, whch, typ, fld)				\

({									\

	struct ceph_osd_request *__oreq = (oreq);			\

	unsigned int __whch = (whch);					\

	BUG_ON(__whch >= __oreq->r_num_ops);				\

	&__oreq->r_ops[__whch].typ.fld;					\

})



extern void osd_req_op_init(struct ceph_osd_request *osd_req,

			    unsigned int which, u16 opcode, u32 flags);

net/ceph/osd_client.c

+0 −8
Original line number Diff line number Diff line
@@ -171,14 +171,6 @@ static void ceph_osd_data_bvecs_init(struct ceph_osd_data *osd_data, 
	osd_data->num_bvecs = num_bvecs;

}



#define osd_req_op_data(oreq, whch, typ, fld)				\

({									\

	struct ceph_osd_request *__oreq = (oreq);			\

	unsigned int __whch = (whch);					\

	BUG_ON(__whch >= __oreq->r_num_ops);				\

	&__oreq->r_ops[__whch].typ.fld;					\

})



static struct ceph_osd_data *

osd_req_op_raw_data_in(struct ceph_osd_request *osd_req, unsigned int which)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE