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

Commit e93aca0a authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

rbd: remove rbd_parent_request_{create,destroy}() 



rbd_parent_request_create() takes a ref on obj_req for child_img_req.
There is no point in doing that because child_img_req is created on
behalf of obj_req -- obj_req is the initiator and can't be completed
before child_img_req.

Open-code the rest of rbd_parent_request_create() and remove it along
with rbd_parent_request_destroy().

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent dfd9875f

drivers/block/rbd.c

+6 −68
Original line number Diff line number Diff line
@@ -1257,13 +1257,6 @@ static void rbd_obj_zero_range(struct rbd_obj_request *obj_req, u32 off, 
	}

}



static void rbd_obj_request_get(struct rbd_obj_request *obj_request)

{

	dout("%s: obj %p (was %d)\n", __func__, obj_request,

		kref_read(&obj_request->kref));

	kref_get(&obj_request->kref);

}



static void rbd_obj_request_destroy(struct kref *kref);

static void rbd_obj_request_put(struct rbd_obj_request *obj_request)

{
@@ -1280,17 +1273,12 @@ static void rbd_img_request_get(struct rbd_img_request *img_request) 
	kref_get(&img_request->kref);

}



static bool img_request_child_test(struct rbd_img_request *img_request);

static void rbd_parent_request_destroy(struct kref *kref);

static void rbd_img_request_destroy(struct kref *kref);

static void rbd_img_request_put(struct rbd_img_request *img_request)

{

	rbd_assert(img_request != NULL);

	dout("%s: img %p (was %d)\n", __func__, img_request,

		kref_read(&img_request->kref));

	if (img_request_child_test(img_request))

		kref_put(&img_request->kref, rbd_parent_request_destroy);

	else

	kref_put(&img_request->kref, rbd_img_request_destroy);

}
@@ -1332,24 +1320,6 @@ static void rbd_obj_request_submit(struct rbd_obj_request *obj_request) 
 * is conditionally set to 1 at image request initialization time

 * and currently never change thereafter.

 */

static void img_request_child_set(struct rbd_img_request *img_request)

{

	set_bit(IMG_REQ_CHILD, &img_request->flags);

	smp_mb();

}



static void img_request_child_clear(struct rbd_img_request *img_request)

{

	clear_bit(IMG_REQ_CHILD, &img_request->flags);

	smp_mb();

}



static bool img_request_child_test(struct rbd_img_request *img_request)

{

	smp_mb();

	return test_bit(IMG_REQ_CHILD, &img_request->flags) != 0;

}



static void img_request_layered_set(struct rbd_img_request *img_request)

{

	set_bit(IMG_REQ_LAYERED, &img_request->flags);
@@ -1653,42 +1623,6 @@ static void rbd_img_request_destroy(struct kref *kref) 
	kmem_cache_free(rbd_img_request_cache, img_request);

}



static struct rbd_img_request *

rbd_parent_request_create(struct rbd_obj_request *obj_request)

{

	struct rbd_img_request *parent_request;

	struct rbd_device *rbd_dev;



	rbd_assert(obj_request->img_request);

	rbd_dev = obj_request->img_request->rbd_dev;



	parent_request = rbd_img_request_create(rbd_dev->parent, OBJ_OP_READ,

						NULL);

	if (!parent_request)

		return NULL;



	img_request_child_set(parent_request);

	rbd_obj_request_get(obj_request);

	parent_request->obj_request = obj_request;



	return parent_request;

}



static void rbd_parent_request_destroy(struct kref *kref)

{

	struct rbd_img_request *parent_request;

	struct rbd_obj_request *orig_request;



	parent_request = container_of(kref, struct rbd_img_request, kref);

	orig_request = parent_request->obj_request;



	parent_request->obj_request = NULL;

	rbd_obj_request_put(orig_request);

	img_request_child_clear(parent_request);



	rbd_img_request_destroy(kref);

}



static void prune_extents(struct ceph_file_extent *img_extents,

			  u32 *num_img_extents, u64 overlap)

{
@@ -2120,10 +2054,14 @@ static int rbd_obj_read_from_parent(struct rbd_obj_request *obj_req) 
	struct rbd_img_request *child_img_req;

	int ret;



	child_img_req = rbd_parent_request_create(obj_req);

	child_img_req = rbd_img_request_create(img_req->rbd_dev->parent,

					       OBJ_OP_READ, NULL);

	if (!child_img_req)

		return -ENOMEM;



	__set_bit(IMG_REQ_CHILD, &child_img_req->flags);

	child_img_req->obj_request = obj_req;



	if (!rbd_img_is_write(img_req)) {

		switch (img_req->data_type) {

		case OBJ_REQUEST_BIO: