Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373375
b: refs/heads/master
c: 28a89dd
h: refs/heads/master
i:
  373373: c2fc0b5
  373371: 1181004
  373367: 3d7774b
  373359: ae28761
  373343: e831ee7
  373311: 359d045
  373247: 30061d9
v: v3
  • Loading branch information
Alex Elder authored and Sage Weil committed May 2, 2013
1 parent dece5ab commit 02dbabe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 888334f966fab232fe9158c2c2f0a935e356b583
refs/heads/master: 28a89ddece39890c255a0c41baf622731a08c288
8 changes: 5 additions & 3 deletions trunk/net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -2203,17 +2203,19 @@ 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 read_partial_message_pages(struct ceph_connection *con,
struct page **pages,
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 page **pages;
struct page *page;
size_t page_offset;
size_t length;
unsigned int left;
int ret;

/* (page) data */
pages = msg->p.pages;
BUG_ON(pages == NULL);
page = pages[msg_pos->page];
page_offset = msg_pos->page_pos;
Expand Down Expand Up @@ -2285,8 +2287,8 @@ static int read_partial_msg_data(struct ceph_connection *con)
data_len = le32_to_cpu(con->in_hdr.data_len);
while (msg_pos->data_pos < data_len) {
if (ceph_msg_has_pages(msg)) {
ret = read_partial_message_pages(con, msg->p.pages,
data_len, do_datacrc);
ret = read_partial_message_pages(con, data_len,
do_datacrc);
if (ret <= 0)
return ret;
#ifdef CONFIG_BLOCK
Expand Down

0 comments on commit 02dbabe

Please sign in to comment.