diff --git a/[refs] b/[refs]
index b5a45c28ba55..84249f9c2131 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f759ebb968dbf185fc079dd2e824b1aa3a3d71aa
+refs/heads/master: c851c49591ebf000c610711e39eea7da5ff05b21
diff --git a/trunk/include/linux/ceph/messenger.h b/trunk/include/linux/ceph/messenger.h
index cdeebae03e0d..4fb870a5b5fc 100644
--- a/trunk/include/linux/ceph/messenger.h
+++ b/trunk/include/linux/ceph/messenger.h
@@ -116,7 +116,10 @@ struct ceph_msg_data {
 	enum ceph_msg_data_type		type;
 	union {
 #ifdef CONFIG_BLOCK
-		struct bio		*bio;
+		struct {
+			struct bio	*bio;
+			size_t		bio_length;
+		};
 #endif /* CONFIG_BLOCK */
 		struct {
 			struct page	**pages;	/* NOT OWNER. */
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index cb5b4e6733f0..731bb9efa2c6 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -3032,6 +3032,7 @@ void ceph_msg_data_set_bio(struct ceph_msg *msg, struct bio *bio,
 	data = ceph_msg_data_create(CEPH_MSG_DATA_BIO);
 	BUG_ON(!data);
 	data->bio = bio;
+	data->bio_length = length;
 
 	msg->data = data;
 	msg->data_length = length;