Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f51a822c authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

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: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent d4b515fa

net/ceph/osd_client.c

+1 −1
Original line number Diff line number Diff line
@@ -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