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

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

libceph: format target object name in caller 



Move the formatting of the object name (oid) to use for an object
request into the caller of calc_layout().  This makes the "vino"
parameter no longer necessary, so get rid of it.

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

net/ceph/osd_client.c

+5 −7
Original line number Diff line number Diff line
@@ -63,9 +63,7 @@ static int op_has_extent(int op) 
 *

 * fill osd op in request message.

 */

static int calc_layout(struct ceph_vino vino,

		       struct ceph_file_layout *layout,

		       u64 off, u64 *plen,

static int calc_layout(struct ceph_file_layout *layout, u64 off, u64 *plen,

		       struct ceph_osd_request *req,

		       struct ceph_osd_req_op *op, u64 *bno)

{
@@ -105,9 +103,6 @@ static int calc_layout(struct ceph_vino vino, 
	dout("calc_layout bno=%llx %llu~%llu (%d pages)\n",

	     *bno, objoff, objlen, req->r_num_pages);



	snprintf(req->r_oid, sizeof(req->r_oid), "%llx.%08llx", vino.ino, *bno);

	req->r_oid_len = strlen(req->r_oid);



	return 0;

}
@@ -469,7 +464,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 
	req->r_flags = flags;



	/* calculate max write size */

	r = calc_layout(vino, layout, off, plen, req, ops, &bno);

	r = calc_layout(layout, off, plen, req, ops, &bno);

	if (r < 0) {

		ceph_osdc_put_request(req);

		return ERR_PTR(r);
@@ -477,6 +472,9 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 


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



	snprintf(req->r_oid, sizeof(req->r_oid), "%llx.%08llx", vino.ino, bno);

	req->r_oid_len = strlen(req->r_oid);



	/* in case it differs from natural (file) alignment that

	   calc_layout filled in for us */

	req->r_num_pages = calc_pages_for(page_align, *plen);