From 2786f36aaf896722f1e90508b1d8fc2efd21de04 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Fri, 5 Apr 2013 14:46:01 -0500
Subject: [PATCH] --- yaml --- r: 373435 b: refs/heads/master c:
 c851c49591ebf000c610711e39eea7da5ff05b21 h: refs/heads/master i:   373433:
 0aa20029ccddb211e8ab0736f422a985d7260a8d   373431:
 519a7af3f08939ea7c2f152fee51ee3c33b90c91 v: v3

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

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;