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

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

rbd: update rbd_img_request_submit() signature 



It should be void now.  Also, object requests are unlinked only in
image request destructor, which can't run before rbd_img_request_put(),
so no need for _safe.

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

drivers/block/rbd.c

+3 −10
Original line number Original line Diff line number Diff line
@@ -2223,21 +2223,17 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request, 
	return -ENOMEM;

	return -ENOMEM;

}

}





static int rbd_img_request_submit(struct rbd_img_request *img_request)

static void rbd_img_request_submit(struct rbd_img_request *img_request)

{

{

	struct rbd_obj_request *obj_request;

	struct rbd_obj_request *obj_request;

	struct rbd_obj_request *next_obj_request;

	int ret = 0;





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

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





	rbd_img_request_get(img_request);

	rbd_img_request_get(img_request);

	for_each_obj_request_safe(img_request, obj_request, next_obj_request) {

	for_each_obj_request(img_request, obj_request)

		rbd_obj_request_submit(obj_request);

		rbd_obj_request_submit(obj_request);

	}





	rbd_img_request_put(img_request);

	rbd_img_request_put(img_request);

	return ret;

}

}





static void rbd_img_end_child_request(struct rbd_img_request *img_req);

static void rbd_img_end_child_request(struct rbd_img_request *img_req);
@@ -3668,10 +3664,7 @@ static void rbd_queue_workfn(struct work_struct *work) 
	if (result)

	if (result)

		goto err_img_request;

		goto err_img_request;





	result = rbd_img_request_submit(img_request);

	rbd_img_request_submit(img_request);

	if (result)

		goto err_img_request;



	if (must_be_locked)

	if (must_be_locked)

		up_read(&rbd_dev->lock_rwsem);

		up_read(&rbd_dev->lock_rwsem);

	return;

	return;