From: Alex Elder Date: Thu, 14 Feb 2013 18:16:43 +0000 (-0600) Subject: libceph: set page alignment in start_request() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f51a822c315e9d4c4c67247bea10e4b8eb795af1;p=linux-beck.git libceph: set page alignment in start_request() The page alignment field for a request is currently set in ceph_osdc_build_request(). It's not needed at that point nor do either of its callers need that value assigned at any point before they call ceph_osdc_start_request(). So move that assignment into ceph_osdc_start_request(). Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index c3d8c6904df3..1d9ebf967b00 100644 --- a/net/ceph/osd_client.c +++ b/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