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>

diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 90198a4070231d0f79bde603945b25a154a61ee4..03eb943ebce56293eeb76d8a84df3c7e4399a4a6 100644 (file)
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -1721,7 +1721,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_client *mdsc,
        msg->front.iov_len = p - msg->front.iov_base;
        msg->hdr.front_len = cpu_to_le32(msg->front.iov_len);
 
-       ceph_msg_data_set_pages(msg, req->r_pages, req->r_num_pages, 0);
+       ceph_msg_data_set_pages(msg, req->r_pages, req->r_data_len, 0);
 
        msg->hdr.data_len = cpu_to_le32(req->r_data_len);
        msg->hdr.data_off = cpu_to_le16(0);

diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index aa463b9b30af9acebaa8f85b434b606b1912f6a9..e6d20e892a88f25a57480006f37bf960e3901b02 100644 (file)
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -220,7 +220,7 @@ extern void ceph_msg_revoke_incoming(struct ceph_msg *msg);
 extern void ceph_con_keepalive(struct ceph_connection *con);
 
 extern 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);
 
 extern struct ceph_msg *ceph_msg_new(int type, int front_len, gfp_t flags,
                                     bool can_fail);

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index cec39cb623f0f609b3d53d9577008ad3ca6e3c62..fc59fcc9be77f92bf228e6929f73efe2a8265f46 100644 (file)
--- 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);

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index a09d5713407523cbc2fd1238dd249aa53b57f18b..f29bedac73107cc4f9faa6f55fc633db2cae3abd 100644 (file)
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1758,12 +1758,9 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc,
 
        osd_data = &req->r_data_out;
        if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGES) {
-               unsigned int page_count;
-
-               page_count = calc_pages_for((u64)osd_data->alignment,
-                                               (u64)osd_data->length);
+               BUG_ON(osd_data->length > (u64) SIZE_MAX);
                ceph_msg_data_set_pages(req->r_request, osd_data->pages,
-                       page_count, osd_data->alignment);
+                       osd_data->length, osd_data->alignment);
 #ifdef CONFIG_BLOCK
        } else if (osd_data->type == CEPH_OSD_DATA_TYPE_BIO) {
                req->r_request->bio = osd_data->bio;
@@ -2119,8 +2116,6 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,
                struct ceph_osd_data *osd_data = &req->r_data_in;
 
                if (osd_data->type == CEPH_OSD_DATA_TYPE_PAGES) {
-                       unsigned int page_count;
-
                        if (osd_data->pages &&
                                unlikely(osd_data->length < data_len)) {
 
@@ -2132,10 +2127,9 @@ static struct ceph_msg *get_reply(struct ceph_connection *con,
                                m = NULL;
                                goto out;
                        }
-                       page_count = calc_pages_for((u64)osd_data->alignment,
-                                                       (u64)osd_data->length);
+                       BUG_ON(osd_data->length > (u64) SIZE_MAX);
                        ceph_msg_data_set_pages(m, osd_data->pages,
-                               osd_data->num_pages, osd_data->alignment);
+                               osd_data->length, osd_data->alignment);
 #ifdef CONFIG_BLOCK
                } else if (osd_data->type == CEPH_OSD_DATA_TYPE_BIO) {
                        m->bio = osd_data->bio;