Commit 70d045f6 authored by Ilya Dryomov's avatar Ilya Dryomov Committed by Ilya Dryomov

rbd: add img_obj_request_simple() helper

To clarify the conditions and make it easier to add new ones.
Signed-off-by: default avatarIlya Dryomov <ilya.dryomov@inktank.com>
parent 4e752f0a
...@@ -2743,11 +2743,10 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request) ...@@ -2743,11 +2743,10 @@ static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)
return ret; return ret;
} }
static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) static bool img_obj_request_simple(struct rbd_obj_request *obj_request)
{ {
struct rbd_img_request *img_request; struct rbd_img_request *img_request;
struct rbd_device *rbd_dev; struct rbd_device *rbd_dev;
bool known;
rbd_assert(obj_request_img_data_test(obj_request)); rbd_assert(obj_request_img_data_test(obj_request));
...@@ -2755,22 +2754,35 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) ...@@ -2755,22 +2754,35 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request)
rbd_assert(img_request); rbd_assert(img_request);
rbd_dev = img_request->rbd_dev; rbd_dev = img_request->rbd_dev;
/* Reads */
if (!img_request_write_test(img_request))
return true;
/* Non-layered writes */
if (!img_request_layered_test(img_request))
return true;
/* /*
* Only writes to layered images need special handling. * Layered writes outside of the parent overlap range don't
* Reads and non-layered writes are simple object requests. * share any data with the parent.
* Layered writes that start beyond the end of the overlap
* with the parent have no parent data, so they too are
* simple object requests. Finally, if the target object is
* known to already exist, its parent data has already been
* copied, so a write to the object can also be handled as a
* simple object request.
*/ */
if (!img_request_write_test(img_request) || if (!obj_request_overlaps_parent(obj_request))
!img_request_layered_test(img_request) || return true;
!obj_request_overlaps_parent(obj_request) ||
((known = obj_request_known_test(obj_request)) &&
obj_request_exists_test(obj_request))) {
/*
* If the object is known to already exist, its parent data has
* already been copied.
*/
if (obj_request_known_test(obj_request) &&
obj_request_exists_test(obj_request))
return true;
return false;
}
static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request)
{
if (img_obj_request_simple(obj_request)) {
struct rbd_device *rbd_dev; struct rbd_device *rbd_dev;
struct ceph_osd_client *osdc; struct ceph_osd_client *osdc;
...@@ -2786,7 +2798,7 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request) ...@@ -2786,7 +2798,7 @@ static int rbd_img_obj_request_submit(struct rbd_obj_request *obj_request)
* start by reading the data for the full target object from * start by reading the data for the full target object from
* the parent so we can use it for a copyup to the target. * the parent so we can use it for a copyup to the target.
*/ */
if (known) if (obj_request_known_test(obj_request))
return rbd_img_obj_parent_read_full(obj_request); return rbd_img_obj_parent_read_full(obj_request);
/* We don't know whether the target exists. Go find out. */ /* We don't know whether the target exists. Go find out. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment