aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-08-01 13:32:18 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 16:16:09 +0200
commitd7cfa2acc05b6ed46754400ab04eadd1b7dc022c (patch)
tree6394319efa31cf5e1193e83cf9bdd41ee97145d3 /drivers/block
parent97ef32aefecf27ce57455ac16a2da18ac7e2c1d6 (diff)
downloadandroid_kernel_m2note-d7cfa2acc05b6ed46754400ab04eadd1b7dc022c.tar.gz
3.10.77 -> 3.10.78
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7e3f45105..dd297099c 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -2115,6 +2115,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 */