From 59357a02608a81dd87ab6543a9ba718c976a0aa6 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Thu, 14 Mar 2013 14:09:06 -0500
Subject: [PATCH] --- yaml --- r: 373405 b: refs/heads/master c:
 fdce58ccb5df621695b079378c619046acabc778 h: refs/heads/master i:   373403:
 620440107d1691ccad83aec6b41e13019cbb5fac v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/block/rbd.c             | 1 +
 trunk/include/linux/ceph/osd_client.h | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 31c72ac33836..7fdce3be6030 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ace6d3a96f00c271b3f337adcde8e8cbe39c3820
+refs/heads/master: fdce58ccb5df621695b079378c619046acabc778
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
index f04d45b6b563..e95a92e89330 100644
--- a/trunk/drivers/block/rbd.c
+++ b/trunk/drivers/block/rbd.c
@@ -1352,6 +1352,7 @@ static struct ceph_osd_request *rbd_osd_req_create(
 		rbd_assert(obj_request->bio_list != NULL);
 		osd_data->type = CEPH_OSD_DATA_TYPE_BIO;
 		osd_data->bio = obj_request->bio_list;
+		osd_data->bio_length = obj_request->length;
 		break;
 	case OBJ_REQUEST_PAGES:
 		osd_data->type = CEPH_OSD_DATA_TYPE_PAGES;
diff --git a/trunk/include/linux/ceph/osd_client.h b/trunk/include/linux/ceph/osd_client.h
index 3b5ba31c2cbd..fdda93ebbb4c 100644
--- a/trunk/include/linux/ceph/osd_client.h
+++ b/trunk/include/linux/ceph/osd_client.h
@@ -71,7 +71,10 @@ struct ceph_osd_data {
 		};
 		struct ceph_pagelist	*pagelist;
 #ifdef CONFIG_BLOCK
-		struct bio       	*bio;
+		struct {
+			struct bio	*bio;		/* list of bios */
+			size_t		bio_length;	/* total in list */
+		};
 #endif /* CONFIG_BLOCK */
 	};
 };