mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
rbd: fix an incorrect assertion condition
In rbd_img_obj_parent_read_full_callback() there is an assertion intended to verify the size of the image request for a full parent read was the size of the original request's target object. But assertion was looking at the parent image order rather than the original one, and these values can differ. Fix that. This resolves: http://tracker.ceph.com/issues/4938 Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
parent
2df3fac758
commit
91c6febb38
@ -2186,13 +2186,13 @@ rbd_img_obj_parent_read_full_callback(struct rbd_img_request *img_request)
|
||||
result = img_request->result;
|
||||
obj_size = img_request->length;
|
||||
xferred = img_request->xferred;
|
||||
rbd_img_request_put(img_request);
|
||||
|
||||
rbd_dev = img_request->rbd_dev;
|
||||
rbd_assert(orig_request->img_request);
|
||||
rbd_dev = orig_request->img_request->rbd_dev;
|
||||
rbd_assert(rbd_dev);
|
||||
rbd_assert(obj_size == (u64)1 << rbd_dev->header.obj_order);
|
||||
|
||||
rbd_img_request_put(img_request);
|
||||
|
||||
if (result)
|
||||
goto out_err;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user