Commit 28a89dde authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

libceph: drop pages parameter

The value passed for "pages" in read_partial_message_pages() is
always the pages pointer from the incoming message, which can be
derived inside that function.  So just get rid of the parameter.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 888334f9
...@@ -2203,10 +2203,11 @@ static int read_partial_message_section(struct ceph_connection *con, ...@@ -2203,10 +2203,11 @@ static int read_partial_message_section(struct ceph_connection *con,
static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip); static int ceph_con_in_msg_alloc(struct ceph_connection *con, int *skip);
static int read_partial_message_pages(struct ceph_connection *con, static int read_partial_message_pages(struct ceph_connection *con,
struct page **pages,
unsigned int data_len, bool do_datacrc) unsigned int data_len, bool do_datacrc)
{ {
struct ceph_msg *msg = con->in_msg;
struct ceph_msg_pos *msg_pos = &con->in_msg_pos; struct ceph_msg_pos *msg_pos = &con->in_msg_pos;
struct page **pages;
struct page *page; struct page *page;
size_t page_offset; size_t page_offset;
size_t length; size_t length;
...@@ -2214,6 +2215,7 @@ static int read_partial_message_pages(struct ceph_connection *con, ...@@ -2214,6 +2215,7 @@ static int read_partial_message_pages(struct ceph_connection *con,
int ret; int ret;
/* (page) data */ /* (page) data */
pages = msg->p.pages;
BUG_ON(pages == NULL); BUG_ON(pages == NULL);
page = pages[msg_pos->page]; page = pages[msg_pos->page];
page_offset = msg_pos->page_pos; page_offset = msg_pos->page_pos;
...@@ -2285,8 +2287,8 @@ static int read_partial_msg_data(struct ceph_connection *con) ...@@ -2285,8 +2287,8 @@ static int read_partial_msg_data(struct ceph_connection *con)
data_len = le32_to_cpu(con->in_hdr.data_len); data_len = le32_to_cpu(con->in_hdr.data_len);
while (msg_pos->data_pos < data_len) { while (msg_pos->data_pos < data_len) {
if (ceph_msg_has_pages(msg)) { if (ceph_msg_has_pages(msg)) {
ret = read_partial_message_pages(con, msg->p.pages, ret = read_partial_message_pages(con, data_len,
data_len, do_datacrc); do_datacrc);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
#ifdef CONFIG_BLOCK #ifdef CONFIG_BLOCK
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment