rbd: end I/O the entire obj_request on error
authorIlya Dryomov <idryomov@gmail.com>
Sat, 25 Apr 2015 12:56:15 +0000 (15:56 +0300)
committerSasha Levin <sasha.levin@oracle.com>
Sun, 17 May 2015 23:12:40 +0000 (19:12 -0400)
commit1a5be433a33086e3f229d4293d67bf69053b0569
tree31f840aba65769d6d71d006bec81997eac8f40ff
parent5286f7e311f2c2f19e18a53953be0be4f54a0ba6
rbd: end I/O the entire obj_request on error

[ Upstream commit 082a75dad84d79d1c15ea9e50f31cb4bb4fa7fd6 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/block/rbd.c