Commit d2d1f17a authored by Josh Durgin's avatar Josh Durgin Committed by Sage Weil

rbd: send snapshot context with writes

Sending the right snapshot context with each write is required for
snapshots to work. Due to the ordering of calls, the snapshot context
is never set for any requests. This causes writes to the current
version of the image to be reflected in all snapshots, which are
supposed to be read-only.

This happens because rbd_osd_req_format_write() sets the snapshot
context based on obj_request->img_request. At this point, however,
obj_request->img_request has not been set yet, to the snapshot context
is set to NULL. Fix this by moving rbd_img_obj_request_add(), which
sets obj_request->img_request, before the osd request formatting

This resolves: default avatarKarol Jurak <>
Signed-off-by: default avatarJosh Durgin <>
Reviewed-by: default avatarSage Weil <>
Reviewed-by: default avatarAlex Elder <>
parent 1617e40c
......@@ -2254,13 +2254,17 @@ static int rbd_img_request_fill(struct rbd_img_request *img_request,
obj_request->pages, length,
offset & ~PAGE_MASK, false, false);
* set obj_request->img_request before formatting
* the osd_request so that it gets the right snapc
rbd_img_obj_request_add(img_request, obj_request);
if (write_request)
obj_request->img_offset = img_offset;
rbd_img_obj_request_add(img_request, obj_request);
img_offset += length;
resid -= length;
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