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

Commit 5b2ab72d authored by Alex Elder's avatar Alex Elder
Browse files

rbd: support reading parent page data 

Currently, rbd_img_parent_read() assumes the incoming object request
contains bio data.  But if a layered image is part of a multi-layer
stack of images it will result in read requests of page data to parent
images.

Fortunately, it's not hard to add support for page data.

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



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

drivers/block/rbd.c

+7 −3
Original line number Diff line number Diff line
@@ -2574,7 +2574,7 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) 
	rbd_assert(obj_request_img_data_test(obj_request));

	rbd_assert(obj_request->img_request != NULL);

	rbd_assert(obj_request->result == (s32) -ENOENT);

	rbd_assert(obj_request->type == OBJ_REQUEST_BIO);

	rbd_assert(obj_request_type_valid(obj_request->type));



	rbd_dev = obj_request->img_request->rbd_dev;

	rbd_assert(rbd_dev->parent != NULL);
@@ -2590,8 +2590,12 @@ static void rbd_img_parent_read(struct rbd_obj_request *obj_request) 
	rbd_obj_request_get(obj_request);

	img_request->obj_request = obj_request;



	if (obj_request->type == OBJ_REQUEST_BIO)

		result = rbd_img_request_fill(img_request, OBJ_REQUEST_BIO,

						obj_request->bio_list);

	else

		result = rbd_img_request_fill(img_request, OBJ_REQUEST_PAGES,

						obj_request->pages);

	if (result)

		goto out_err;