Patch "rbd: end I/O the entire obj_request on error" has been added to the 3.10-stable tree

This is a note to let you know that I've just added the patch titled

rbd: end I/O the entire obj_request on error

to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
rbd-end-i-o-the-entire-obj_request-on-error.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ilya Dryomov <[email protected]>
Date: Sat, 25 Apr 2015 15:56:15 +0300
Subject: rbd: end I/O the entire obj_request on error

From: Ilya Dryomov <[email protected]>

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.

---
 drivers/block/rbd.c |    5 +++++
 1 file changed, 5 insertions(+)

@@ -2115,6 +2115,11 @@ static bool rbd_img_obj_end_request(stru
 			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 */

Patches currently in stable-queue which might be from [email protected] are

queue-3.10/rbd-end-i-o-the-entire-obj_request-on-error.patch