Commit bd2931b5 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://

Pull Ceph fix from Sage Weil:
 "This is a recently spotted regression in the snapshot behavior...

  It turns out several tests weren't being run in the nightlies so this
  took a while to spot"

* 'for-linus' of git://
  rbd: send snapshot context with writes
parents 63edbce1 d2d1f17a
......@@ -2252,13 +2252,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