summaryrefslogtreecommitdiffstats
path: root/net/ceph/messenger.c
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-03-07 15:38:26 -0600
committerSage Weil <sage@inktank.com>2013-05-01 21:16:39 -0700
commitf1baeb2b9fc1c2c87ec02f1bf8cb88e108d4fbce (patch)
tree5ca6b72adeeea2423367ea3313902cf61fd45980 /net/ceph/messenger.c
parent02afca6ca00b7972887c5cc77068356f33bdfc18 (diff)
downloadblackbird-op-linux-f1baeb2b9fc1c2c87ec02f1bf8cb88e108d4fbce.tar.gz
blackbird-op-linux-f1baeb2b9fc1c2c87ec02f1bf8cb88e108d4fbce.zip
libceph: set page info with byte length
When setting page array information for message data, provide the byte length rather than the page count ceph_msg_data_set_pages(). Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
-rw-r--r--net/ceph/messenger.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index cec39cb623f0..fc59fcc9be77 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2690,13 +2690,13 @@ void ceph_con_keepalive(struct ceph_connection *con)
EXPORT_SYMBOL(ceph_con_keepalive);
void ceph_msg_data_set_pages(struct ceph_msg *msg, struct page **pages,
- unsigned int page_count, size_t alignment)
+ size_t length, size_t alignment)
{
/* BUG_ON(msg->pages); */
/* BUG_ON(msg->page_count); */
msg->pages = pages;
- msg->page_count = page_count;
+ msg->page_count = calc_pages_for((u64)alignment, (u64)length);
msg->page_alignment = alignment & ~PAGE_MASK;
}
EXPORT_SYMBOL(ceph_msg_data_set_pages);
OpenPOWER on IntegriCloud