Commit d435c9a7 authored Aug 27, 2019 by Ilya Dryomov

rbd: restore zeroing past the overlap when reading from parent



The parent image is read only up to the overlap point, the rest of
the buffer should be zeroed.  This snuck in because as it turns out
the overlap test case has not been triggering this code path for
a while now.

Fixes: a9b67e69 ("rbd: replace obj_req->tried_parent with obj_req->read_state")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

parent e8c99200

drivers/block/rbd.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -3038,6 +3038,17 @@ again:
		}
		return true;
		case RBD_OBJ_READ_PARENT:
		/*
		* The parent image is read only up to the overlap -- zero-fill
		* from the overlap to the end of the request.
		*/
		if (!*result) {
		u32 obj_overlap = rbd_obj_img_extents_bytes(obj_req);

		if (obj_overlap < obj_req->ex.oe_len)
		rbd_obj_zero_range(obj_req, obj_overlap,
		obj_req->ex.oe_len - obj_overlap);
		}
		return true;
		default:
		BUG();

Admin message