From: Ilya Dryomov Date: Sat, 25 Apr 2015 12:56:15 +0000 (+0300) Subject: rbd: end I/O the entire obj_request on error X-Git-Tag: v3.16.35~2121 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=beb674c78c2c71ad30925825fd81c8e1dc581bc9;p=thirdparty%2Fkernel%2Fstable.git rbd: end I/O the entire obj_request on error commit 082a75dad84d79d1c15ea9e50f31cb4bb4fa7fd6 upstream. 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 Reported-by: Shawn Edwards Reviewed-by: Sage Weil Signed-off-by: Ilya Dryomov Signed-off-by: Luis Henriques --- diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 73d5388bd1f6e..f017d1964eb6c 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2167,6 +2167,11 @@ static bool rbd_img_obj_end_request(struct rbd_obj_request *obj_request) result, xferred); if (!img_request->result) img_request->result = result; + /* + * Need to end I/O on the entire obj_request worth of + * bytes in case of error. + */ + xferred = obj_request->length; } /* Image object requests don't own their page array */