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

Commit 60e56f13 authored by Alex Elder's avatar Alex Elder
Browse files

libceph: kill ceph_calc_raw_layout() 



There is no caller of ceph_calc_raw_layout() outside of libceph, so
there's no need to export from the module.

Furthermore, there is only one caller, in calc_layout(), and it
is not much more than a simple wrapper for that function.

So get rid of ceph_calc_raw_layout() and embed it instead within
calc_layout().

While touching "osd_client.c", get rid of the unnecessary forward
declaration of __send_request().

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

include/linux/ceph/osd_client.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -207,11 +207,6 @@ extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc, 
extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,

extern void ceph_osdc_handle_map(struct ceph_osd_client *osdc,

				 struct ceph_msg *msg);

				 struct ceph_msg *msg);





extern int ceph_calc_raw_layout(struct ceph_file_layout *layout,

			u64 off, u64 *plen, u64 *bno,

			struct ceph_osd_request *req,

			struct ceph_osd_req_op *op);



extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,

extern struct ceph_osd_request *ceph_osdc_alloc_request(struct ceph_osd_client *osdc,

					       struct ceph_snap_context *snapc,

					       struct ceph_snap_context *snapc,

					       unsigned int num_op,

					       unsigned int num_op,

net/ceph/osd_client.c

+32 −45
Original line number Original line Diff line number Diff line
@@ -38,49 +38,6 @@ static int op_has_extent(int op) 
		op == CEPH_OSD_OP_WRITE);

		op == CEPH_OSD_OP_WRITE);

}

}





int ceph_calc_raw_layout(struct ceph_file_layout *layout,

			u64 off, u64 *plen, u64 *bno,

			struct ceph_osd_request *req,

			struct ceph_osd_req_op *op)

{

	u64 orig_len = *plen;

	u64 objoff, objlen;    /* extent in object */

	int r;



	/* object extent? */

	r = ceph_calc_file_object_mapping(layout, off, orig_len, bno,

					  &objoff, &objlen);

	if (r < 0)

		return r;

	if (objlen < orig_len) {

		*plen = objlen;

		dout(" skipping last %llu, final file extent %llu~%llu\n",

		     orig_len - *plen, off, *plen);

	}



	if (op_has_extent(op->op)) {

		u32 osize = le32_to_cpu(layout->fl_object_size);

		op->extent.offset = objoff;

		op->extent.length = objlen;

		if (op->extent.truncate_size <= off - objoff) {

			op->extent.truncate_size = 0;

		} else {

			op->extent.truncate_size -= off - objoff;

			if (op->extent.truncate_size > osize)

				op->extent.truncate_size = osize;

		}

	}

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

	req->r_page_alignment = off & ~PAGE_MASK;

	if (op->op == CEPH_OSD_OP_WRITE)

		op->payload_len = *plen;



	dout("calc_layout bno=%llx %llu~%llu (%d pages)\n",

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

	return 0;

}

EXPORT_SYMBOL(ceph_calc_raw_layout);



/*

/*

 * Implement client access to distributed object storage cluster.

 * Implement client access to distributed object storage cluster.

 *

 *
@@ -112,12 +69,42 @@ static int calc_layout(struct ceph_vino vino, 
		       struct ceph_osd_request *req,

		       struct ceph_osd_request *req,

		       struct ceph_osd_req_op *op)

		       struct ceph_osd_req_op *op)

{

{

	u64 bno;

	u64 orig_len = *plen;

	u64 bno = 0;

	u64 objoff = 0;

	u64 objlen = 0;

	int r;

	int r;





	r = ceph_calc_raw_layout(layout, off, plen, &bno, req, op);

	/* object extent? */

	r = ceph_calc_file_object_mapping(layout, off, orig_len, &bno,

					  &objoff, &objlen);

	if (r < 0)

	if (r < 0)

		return r;

		return r;

	if (objlen < orig_len) {

		*plen = objlen;

		dout(" skipping last %llu, final file extent %llu~%llu\n",

		     orig_len - *plen, off, *plen);

	}



	if (op_has_extent(op->op)) {

		u32 osize = le32_to_cpu(layout->fl_object_size);

		op->extent.offset = objoff;

		op->extent.length = objlen;

		if (op->extent.truncate_size <= off - objoff) {

			op->extent.truncate_size = 0;

		} else {

			op->extent.truncate_size -= off - objoff;

			if (op->extent.truncate_size > osize)

				op->extent.truncate_size = osize;

		}

	}

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

	req->r_page_alignment = off & ~PAGE_MASK;

	if (op->op == CEPH_OSD_OP_WRITE)

		op->payload_len = *plen;



	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);

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

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

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