evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rbd: define image request layered flag

Browse source 
Define a flag indicating whether an image request is for a layered
image (one with a parent image to which requests will be redirected
if the target object of a request does not exist).  The code that
checks this flag will be added shortly.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Alex Elder 2013-01-24 16:13:36 -06:00 • committed by Sage Weil
parent 9849e98636
commit d0b2e94455
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/block/rbd.c
View file

@ -205,6 +205,7 @@ struct rbd_obj_request {
enum img_req_flags { enum img_req_flags {
IMG_REQ_WRITE, /* I/O direction: read = 0, write = 1 */ IMG_REQ_WRITE, /* I/O direction: read = 0, write = 1 */
IMG_REQ_CHILD, /* initiator: block = 0, child image = 1 */ IMG_REQ_CHILD, /* initiator: block = 0, child image = 1 */
IMG_REQ_LAYERED, /* ENOENT handling: normal = 0, layered = 1 */
}; };
struct rbd_img_request { struct rbd_img_request {
@ -1247,6 +1248,18 @@ static bool img_request_child_test(struct rbd_img_request *img_request)
return test_bit(IMG_REQ_CHILD, &img_request->flags) != 0; 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);
smp_mb();
}
static bool img_request_layered_test(struct rbd_img_request *img_request)
{
smp_mb();
return test_bit(IMG_REQ_LAYERED, &img_request->flags) != 0;
}
static void static void
rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request) rbd_img_obj_request_read_callback(struct rbd_obj_request *obj_request)
{ {
@ -1549,6 +1562,8 @@ static struct rbd_img_request *rbd_img_request_create(
} }
if (child_request) if (child_request)
img_request_child_set(img_request); img_request_child_set(img_request);
if (rbd_dev->parent_spec)
img_request_layered_set(img_request);
spin_lock_init(&img_request->completion_lock); spin_lock_init(&img_request->completion_lock);
img_request->next_completion = 0; img_request->next_completion = 0;
img_request->callback = NULL; img_request->callback = NULL;
@ -1557,6 +1572,7 @@ static struct rbd_img_request *rbd_img_request_create(
INIT_LIST_HEAD(&img_request->obj_requests); INIT_LIST_HEAD(&img_request->obj_requests);
kref_init(&img_request->kref); kref_init(&img_request->kref);
(void) img_request_layered_test(img_request); /* Avoid a warning */
rbd_img_request_get(img_request); /* Avoid a warning */ rbd_img_request_get(img_request); /* Avoid a warning */
rbd_img_request_put(img_request); /* TEMPORARY */ rbd_img_request_put(img_request); /* TEMPORARY */