Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0270324 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: use osd_req_op_extent_init() 



Use osd_req_op_extent_init() in ceph_osdc_new_request() to
initialize the one or two ops built in that function.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent d18d1e28

net/ceph/osd_client.c

+3 −10
Original line number Diff line number Diff line
@@ -581,17 +581,10 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 
			truncate_size = object_size;

	}



	memset(&ops, 0, sizeof ops);

	ops[0].op = opcode;

	ops[0].extent.offset = objoff;

	ops[0].extent.length = objlen;

	ops[0].extent.truncate_size = truncate_size;

	ops[0].extent.truncate_seq = truncate_seq;

	if (ops[0].op == CEPH_OSD_OP_WRITE)

		ops[0].payload_len = *plen;



	osd_req_op_extent_init(&ops[0], opcode, objoff, objlen,

				truncate_size, truncate_seq);

	if (do_sync)

		ops[1].op = CEPH_OSD_OP_STARTSYNC;

		osd_req_op_init(&ops[1], CEPH_OSD_OP_STARTSYNC);



	req->r_file_layout = *layout;  /* keep a copy */