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

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

rbd: define inbound data size for method ops 

When rbd creates an object request containing an object method call
operation it is passing 0 for the size.  I originally thought this
was because the length was not needed for method calls, but I think
it really should be supplied, to describe how much space is
available to receive response data.  So provide the supplied length.

This resolves:
    http://tracker.ceph.com/issues/4659



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

drivers/block/rbd.c

+6 −7
Original line number Diff line number Diff line
@@ -1840,12 +1840,11 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev, 
	int ret;



	/*

	 * Method calls are ultimately read operations but they

	 * don't involve object data (so no offset or length).

	 * The result should placed into the inbound buffer

	 * provided.  They also supply outbound data--parameters for

	 * the object method.  Currently if this is present it will

	 * be a snapshot id.

	 * Method calls are ultimately read operations.  The result

	 * should placed into the inbound buffer provided.  They

	 * also supply outbound data--parameters for the object

	 * method.  Currently if this is present it will be a

	 * snapshot id.

	 */

	page_count = (u32) calc_pages_for(0, inbound_size);

	pages = ceph_alloc_page_vector(page_count, GFP_KERNEL);
@@ -1853,7 +1852,7 @@ static int rbd_obj_method_sync(struct rbd_device *rbd_dev, 
		return PTR_ERR(pages);



	ret = -ENOMEM;

	obj_request = rbd_obj_request_create(object_name, 0, 0,

	obj_request = rbd_obj_request_create(object_name, 0, inbound_size,

							OBJ_REQUEST_PAGES);

	if (!obj_request)

		goto out;