From 02dbabed499172240cd0769340f7158f3ea51e98 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Mon, 11 Mar 2013 23:34:22 -0500
Subject: [PATCH] --- yaml --- r: 373375 b: refs/heads/master c:
 28a89ddece39890c255a0c41baf622731a08c288 h: refs/heads/master i:   373373:
 c2fc0b53285a2defd5cf26d13330c4d596d84399   373371:
 118100482309a47a1d9f5629534c8e3abb4b62ff   373367:
 3d7774bc6eb475e9ec460c0e8d260f59c36782cb   373359:
 ae28761f1021b4e9603f7bdcd4203a1cc285ef13   373343:
 e831ee7f5e496126b50116211e0a060f6d0f9d07   373311:
 359d045b1ab73312fc69277912765f49224760af   373247:
 30061d9a3d6c181c61e1bba4c0abe486175057cf v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 650e26007202..bec40e8539f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 888334f966fab232fe9158c2c2f0a935e356b583
+refs/heads/master: 28a89ddece39890c255a0c41baf622731a08c288
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 0a9f6362d4d8..95f90b01f753 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -2203,10 +2203,11 @@ static int read_partial_message_section(struct ceph_connection *con,
 static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip);
 
 static int read_partial_message_pages(struct ceph_connection *con,
-				      struct page **pages,
 				      unsigned int data_len, bool do_datacrc)
 {
+	struct ceph_msg *msg = con->in_msg;
 	struct ceph_msg_pos *msg_pos = &con->in_msg_pos;
+	struct page **pages;
 	struct page *page;
 	size_t page_offset;
 	size_t length;
@@ -2214,6 +2215,7 @@ static int read_partial_message_pages(struct ceph_connection *con,
 	int ret;
 
 	/* (page) data */
+	pages = msg->p.pages;
 	BUG_ON(pages == NULL);
 	page = pages[msg_pos->page];
 	page_offset = msg_pos->page_pos;
@@ -2285,8 +2287,8 @@ static int read_partial_msg_data(struct ceph_connection *con)
 	data_len = le32_to_cpu(con->in_hdr.data_len);
 	while (msg_pos->data_pos < data_len) {
 		if (ceph_msg_has_pages(msg)) {
-			ret = read_partial_message_pages(con, msg->p.pages,
-						 data_len, do_datacrc);
+			ret = read_partial_message_pages(con, data_len,
+							do_datacrc);
 			if (ret <= 0)
 				return ret;
 #ifdef CONFIG_BLOCK