Commit 6fa72720 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client 

Pull Ceph RBD fix from Sage Weil.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: end I/O the entire obj_request on error
parents 64887b68 082a75da

drivers/block/rbd.c

+5 −0
Original line number Diff line number Diff line
@@ -2264,6 +2264,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 */