| Message ID | 1445162403-7612-1-git-send-email-shraddha.6596@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Oct 18, 2015 at 12:00 PM, Shraddha Barke <shraddha.6596@gmail.com> wrote: > Use local variable cursor in place of &msg->cursor in > read_partial_msg_data() > > Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> > --- > net/ceph/messenger.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c > index b9b0e3b..b3d1973 100644 > --- a/net/ceph/messenger.c > +++ b/net/ceph/messenger.c > @@ -2231,7 +2231,7 @@ static int read_partial_message_section(struct ceph_connection *con, > static int read_partial_msg_data(struct ceph_connection *con) > { > struct ceph_msg *msg = con->in_msg; > - struct ceph_msg_data_cursor *cursor = &msg->cursor; > + struct ceph_msg_data_cursor *cursor = cursor; ^^^^^^^^^^^^^^^^ This is not going to work... Thanks, Ilya -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index b9b0e3b..b3d1973 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2231,7 +2231,7 @@ static int read_partial_message_section(struct ceph_connection *con, static int read_partial_msg_data(struct ceph_connection *con) { struct ceph_msg *msg = con->in_msg; - struct ceph_msg_data_cursor *cursor = &msg->cursor; + struct ceph_msg_data_cursor *cursor = cursor; const bool do_datacrc = !con->msgr->nocrc; struct page *page; size_t page_offset; @@ -2246,7 +2246,7 @@ static int read_partial_msg_data(struct ceph_connection *con) if (do_datacrc) crc = con->in_data_crc; while (cursor->resid) { - page = ceph_msg_data_next(&msg->cursor, &page_offset, &length, + page = ceph_msg_data_next(cursor, &page_offset, &length, NULL); ret = ceph_tcp_recvpage(con->sock, page, page_offset, length); if (ret <= 0) { @@ -2258,7 +2258,7 @@ static int read_partial_msg_data(struct ceph_connection *con) if (do_datacrc) crc = ceph_crc32c_page(crc, page, page_offset, ret); - (void) ceph_msg_data_advance(&msg->cursor, (size_t)ret); + (void) ceph_msg_data_advance(cursor, (size_t)ret); } if (do_datacrc) con->in_data_crc = crc;
Use local variable cursor in place of &msg->cursor in read_partial_msg_data() Signed-off-by: Shraddha Barke <shraddha.6596@gmail.com> --- net/ceph/messenger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)