Skip to content

Commit 082a75d

Browse files
idryomovliewegas
authored andcommitted
rbd: end I/O the entire obj_request on error
When we end I/O struct request with error, we need to pass obj_request->length as @nr_bytes so that the entire obj_request worth of bytes is completed. Otherwise block layer ends up confused and we trip on rbd_assert(more ^ (which == img_request->obj_request_count)); in rbd_img_obj_callback() due to more being true no matter what. We already do it in most cases but we are missing some, in particular those where we don't even get a chance to submit any obj_requests, due to an early -ENOMEM for example. A number of obj_request->xferred assignments seem to be redundant but I haven't touched any of obj_request->xferred stuff to keep this small and isolated. Cc: Alex Elder <elder@linaro.org> Cc: stable@vger.kernel.org # 3.10+ Reported-by: Shawn Edwards <lesser.evil@gmail.com> Reviewed-by: Sage Weil <sage@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
1 parent b787f68 commit 082a75d

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/block/rbd.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,6 +2264,11 @@ static bool rbd_img_obj_end_request(struct rbd_obj_request *obj_request)
22642264
result, xferred);
22652265
if (!img_request->result)
22662266
img_request->result = result;
2267+
/*
2268+
* Need to end I/O on the entire obj_request worth of
2269+
* bytes in case of error.
2270+
*/
2271+
xferred = obj_request->length;
22672272
}
22682273

22692274
/* Image object requests don't own their page array */

0 commit comments

Comments
 (0)