Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 320332
b: refs/heads/master
c: a410702
h: refs/heads/master
v: v3
  • Loading branch information
Sage Weil committed Jul 31, 2012
1 parent 58fe238 commit aea461a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 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: 6194ea895e447fdf4adfd23f67873a32bf4f15ae
refs/heads/master: a4107026976f06c9a6ce8cc84a763564ee39d901
11 changes: 6 additions & 5 deletions trunk/net/ceph/messenger.c
Original file line number Diff line number Diff line change
Expand Up @@ -1872,6 +1872,11 @@ static int read_partial_message(struct ceph_connection *con)
else
con->in_msg_pos.page_pos = 0;
con->in_msg_pos.data_pos = 0;

#ifdef CONFIG_BLOCK
if (m->bio)
init_bio_iter(m->bio, &m->bio_iter, &m->bio_seg);
#endif
}

/* front */
Expand All @@ -1888,10 +1893,6 @@ static int read_partial_message(struct ceph_connection *con)
if (ret <= 0)
return ret;
}
#ifdef CONFIG_BLOCK
if (m->bio && !m->bio_iter)
init_bio_iter(m->bio, &m->bio_iter, &m->bio_seg);
#endif

/* (page) data */
while (con->in_msg_pos.data_pos < data_len) {
Expand All @@ -1902,7 +1903,7 @@ static int read_partial_message(struct ceph_connection *con)
return ret;
#ifdef CONFIG_BLOCK
} else if (m->bio) {

BUG_ON(!m->bio_iter);
ret = read_partial_message_bio(con,
&m->bio_iter, &m->bio_seg,
data_len, do_datacrc);
Expand Down

0 comments on commit aea461a

Please sign in to comment.