Commit af77f26c authored by Alex Elder's avatar Alex Elder
Browse files

rbd: drop oid parameters from ceph_osdc_build_request() 



The last two parameters to ceph_osd_build_request() describe the
object id, but the values passed always come from the osd request
structure whose address is also provided.  Get rid of those last
two parameters.

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

drivers/block/rbd.c

+1 −5
Original line number Diff line number Diff line
@@ -1176,11 +1176,7 @@ static int rbd_do_request(struct request *rq, 
				snapid, ofs, &len, &bno, osd_req, ops);

	rbd_assert(ret == 0);



	ceph_osdc_build_request(osd_req, ofs, &len,

				ops,

				snapc,

				&mtime,

				osd_req->r_oid, osd_req->r_oid_len);

	ceph_osdc_build_request(osd_req, ofs, &len, ops, snapc, &mtime);



	if (linger_req) {

		ceph_osdc_set_request_linger(osdc, osd_req);

include/linux/ceph/osd_client.h

+1 −3
Original line number Diff line number Diff line
@@ -227,9 +227,7 @@ extern void ceph_osdc_build_request(struct ceph_osd_request *req, 
				    u64 off, u64 *plen,

				    struct ceph_osd_req_op *src_ops,

				    struct ceph_snap_context *snapc,

				    struct timespec *mtime,

				    const char *oid,

				    int oid_len);

				    struct timespec *mtime);



extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,

				      struct ceph_file_layout *layout,

net/ceph/osd_client.c

+5 −8
Original line number Diff line number Diff line
@@ -376,9 +376,7 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, 
			     u64 off, u64 *plen,

			     struct ceph_osd_req_op *src_ops,

			     struct ceph_snap_context *snapc,

			     struct timespec *mtime,

			     const char *oid,

			     int oid_len)

			     struct timespec *mtime)

{

	struct ceph_msg *msg = req->r_request;

	struct ceph_osd_request_head *head;
@@ -405,9 +403,9 @@ void ceph_osdc_build_request(struct ceph_osd_request *req, 




	/* fill in oid */

	head->object_len = cpu_to_le32(oid_len);

	memcpy(p, oid, oid_len);

	p += oid_len;

	head->object_len = cpu_to_le32(req->r_oid_len);

	memcpy(p, req->r_oid, req->r_oid_len);

	p += req->r_oid_len;



	src_op = src_ops;

	while (src_op->op) {
@@ -506,8 +504,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc, 


	ceph_osdc_build_request(req, off, plen, ops,

				snapc,

				mtime,

				req->r_oid, req->r_oid_len);

				mtime);



	return req;

}