From cf7c0ee5df67e4381fb8738d65b2158adcb19981 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Thu, 14 Feb 2013 12:16:43 -0600
Subject: [PATCH] --- yaml --- r: 373303 b: refs/heads/master c:
 f51a822c315e9d4c4c67247bea10e4b8eb795af1 h: refs/heads/master i:   373301:
 f889587f1f6cf1b1519ce4ef23d3a8f3459bad06   373299:
 790d4551470d8aa7c1978055ada1c8cde3f42d51   373295:
 f9d707c8f648f8df7b76d92f3cfe35251600c516 v: v3

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

diff --git a/[refs] b/[refs]
index 40a0e851c237..09699b64b488 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4b515fa10dd52a2aef88df7299e9f3a8ab0957a
+refs/heads/master: f51a822c315e9d4c4c67247bea10e4b8eb795af1
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
index c3d8c6904df3..1d9ebf967b00 100644
--- a/trunk/net/ceph/osd_client.c
+++ b/trunk/net/ceph/osd_client.c
@@ -399,7 +399,6 @@ void ceph_osdc_build_request(struct ceph_osd_request *req,
 		data_len += len;
 	}
 	req->r_request->hdr.data_len = cpu_to_le32(data_len);
-	req->r_request->page_alignment = req->r_page_alignment;
 
 	BUG_ON(p > msg->front.iov_base + msg->front.iov_len);
 	msg_size = p - msg->front.iov_base;
@@ -1743,6 +1742,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 
 	req->r_request->pages = req->r_pages;
 	req->r_request->page_count = req->r_num_pages;
+	req->r_request->page_alignment = req->r_page_alignment;
 #ifdef CONFIG_BLOCK
 	req->r_request->bio = req->r_bio;
 #endif